Add entity_type and bundle in various spots so its available to others.