Added generic type to MappingAdapter, Enum, etc