Redesign architecture