Refactor fetchparser