Update to support milliseconds