Separate M2/WMO code from ADT