Decouple dependencies/assumptions in MAC change