Fixing DynamicEnvironment as HashMap issue