Add extra time support