Added support for milliseconds