Support latest SDKs