Model refactoring. Day 2.