Addition of Sam's event classes to master