Change tree mamagement from delegate to data core