Update for spree 2.2