Added eventId to the raised event
Drop instruction refactoring and tests