ENH: Better MAC handling