Added environment based config