Changed date field from timestamp to java.util.Date