Minor - currently unstable as HSQL db is being initialized twice