Adding iOS 8 category support