DRM-90 fix environment interface