Updated for Spree 2.3.0