refactor domain model, add meta model, update integration tests and daos