refactoring to use new models names, imports, and columns