Redesigned hierarchy