Architecture redesign