Changed date type from String to java.sql.Date