DMS 0.5.x re-factored implementation