Added Another Part of the Architecture Redesign