Updating Sources for SDK 2.0, stage 1