Support SDK 1.0.7