Added capability for MSF003 and MSF006