changes for spree-2-0