Refactor for harp-orm/harp 0.2.0