Added originalTarget and originalType to Event