Re-added count of nodes and leaves to add/remove methods