Improve DynamicMapMask