Updated dm_server