Added handling of time amount/unit changes