migrate to hsqldb and one2one relation