Updated for Spree 2.1