Added more time types