Support for Spree 2.x