Updated for MAT iOS SDK 3.5.4