Modified to adapt changes in TreeStrategy base type