BUG-987: improve EnumerationType