Updated for spree 1.3