The local changes are not yet generic enough to be shared among stack, so
  Introduce local changes here better