Refactor Table class.

Change-Id: I5619da08b7f0912fb7abd00fef857fb825c9b4c6