Add proper environment