Added category support for iOS 8