CLI: Added --environment flag