Add support for spree 2-2