Adapt event framework to new data structure