initial refactor to return Result from IncludeHierarchyCommands