Refactor

Upgrade to haro-orm/harp 0.2.0