Adding support for enum's