Added non-shared enviroment