We report on our re-engineering effort to refactor and unify two somewhat disjoint DMS implementations -- Jini and JMS by refactoring their parent framework -- the DMF, within GIPSY.