Added event emitting