Added HSQLDB Support