Refactored result type and remodeled the result list