Support for HSQLDB > 2