Changed to spree 2.0