Adding some missing MSP
Working on autopilot