Refactoring in SFSmartStorePlugin