Make relavent changes for SDK refactoring.