Make Scanners utility class more generic