Create environment form + Enhance EnvironmentRepository