Refactoring of runtime tree