Refactoring models, tables, and collections.
Refactoring update.