Added structure event classes