Better support for enums