Support for Spree 2.0