Spree 2.1+ compatibility