Updated mac handling