Date changed to long
DateUtil added