adding support for enums within classes