Basket model refactoring [2]