Moved Enums from their Interface specific classes to be framework global