simplified enums again
Updated for Xcode6-Beta4