Support for spree 2.1