Reamed "context_part" to "entity"