Added some implementation to Environment Addon