added hsqldb dependency
Criteria updates