Added cloned MACs support