Changed defines from config.environment to env