Support for multinomial
Add HSQLDB support