Moved ResourceHierarchy to Extended API