Add enumerated types - not fully supported yet