Add support for Spree 2-1