#514 Removing TimeUnit from api and replace with Duration