Support for spree 2.0.4 and higher