Improved SfSdk API