finishing moving to an event oriented approach to discovery of injection points