Added time of day support