better event mapping and scope follow