Added support for enums
map name for Node, handle types in catch clause