Updating code base for SDK 2.0, Stage - 2