Updated for MAT iOS SDK 3.6