Added hsql datasource, improved model toString formatting