Refactor for Spree 2