Loop, dumpdata, more internally consistent model add