Add new models with fk and m2m fields
Fix bug with fk column selector not showing