Improve instance table.

Change-Id: I02722cc0388145a29d48f938edc36b28a193f6fd