Added enviroment preparation