Service redesign, designed server context, small rebasing