Initial inclusion of Enum, Set types. Not tested. Removed redundant types, changed Text to MediumText (Text is a little too small to be safe for many use cases).