Refactor Scan based on portal profile