Support for Spree 2.1.x