Added support for Annotations and improved Enum support.