Adds back required time lib
Adjusts date container to fit large values