PersistenceUtil refactoring + in memory H2 database