Moved environment variables to env section