Enums improved to allow select on keys