Added more Environment variables.