Decoupling Change from Design