Adding internal and UI changes for millisecond support