Now also returning primary key columns.

So the schema is more complete and useful.