Added event framework to Waypoint.