i dont think we need both environment and environment_id, I would drop the environment one ?