Some quick cleanup in orm hook and merge in new models/adapters instead of overriding/wiping