changes to ComponentTreeValidator