Changes include for SDK 2.0