Added handling for tables, columns, indexes and random record