adding DMS support