Add MAC support