Redesigned solution structure