Check for an event before prevent propagation
Rename method mappers and update model apply code