Changed date management from Date to GregorianCalendar