Model code refactoring. Just one vector for all the models