Updated utility to include day/night value