Removed h2 dependency and domain object