Updated to use common event interface