Adding Environment Functionality