added initial support for Enums