Support spree 2.0