Add mac arrangement mode for hhk