Adding infra-structure to mutations