Work done to address issues with working without RoleEnvironment