Updated Time to support combined units