Added single use switch
Added missing command ids
Added constraint for hours