Prepears to 2.1 spree update