Add time support