Some more changes to work with Environment variables