Making necessary changes for xcode 6 beta 4 & 5.