Add entity_reference support