Prepared for SDK 2.0