Added more time units to class Time