Adds better support for Spree 2.2.x