Removing dependancy for Spree 2 and above