Rework the design models (the first step)