Added more time units