Improve TimeUnit encapsulation