Add planning and control