Adapted to DM 4.1.2 - Release 1.3.0