Modified event model methods