Better handling of Enum