Added EnvironmentSelector and Stage.