Refactor (use BulkWalkAll to avoid callbacks)