Added new scanners, cleaned up the format file entries