Make Tree structure much more simple