Updated for new spree version