Shop model refactoring