Model refactoring. Day 4