Add support for larger scan array