Add handling for optional hours