Working on EnvironmentBuilder.
Rework EnvironmentBuilder.