Some updates

HSQLDB upgrade
Set extended persistence context explicitly