Made Environment factory aware
0.10.2