Deprecating branch - moved to spree