Add EventTree, update Base, tests