Refactor many models