Renamed date helper methods. Added some more helpers