Changing MRP and SRP to store and use MAC chanend instead of broken API
function