Demerged core specific code from RestApiSDK