add support for count
Adjust to fix circular dependencies
Remove old traversal engine