Add two sections: waypoints and events