More DMS variations accepted as input