Refactor to H2 db