Changed hierarchy format