Loosen up the dependency on spree