Fixed issues with old hierarchy