Added scanning of table