Updated table field names