Updated table names and attributes