Worked a bit on compatibility to mdm