Adapted to be compatible with DM 4.4