Updated for Spree 2.2