Complete model, simplify migrations
Fix org edit case