Add support for Object mapping type and enabled attribute.