new events, fixes for the data mapping