Removed external dependency and add millisecond