Add Duration support and remove milli/nanoseconds