Add support for Spree >= 2.1.1