Add support for Spree 2