Fixed support for Enums