Latest update from Context Aware Planner