FIX: proper require statements with new Spree