Added support for associated_entity_type.