Added mapper events interface