is this still moving to EntityId, or is it tightly tied to tools now?