Model refactoring. Day 3