SFRestTemplate refactoring