Added initial MAC support