Added more features to TimeUtils