MAC SDK refactor details