Added parsing for table number