Few changes in TablesData