Basket model refactoring