updates to entities and matter service