[Parser] Revamp of ToDoAdd and ToDoEdit