Closes #472 by adding the scanner type to the table.
Merge commit '7431ba0f16d5c79e58f5e7cb11af8e19b2b06c22' into HEAD