Updated the SceneFactory class and parts of the Environment enum
Updated the SceneFactory class and parts of the Environment enum