Initial MAP-T support