added support for Enumerated and Embedded