Shop module fixes
Abstract models changed