Updated for HSQL database.