Top-level table support

Change-Id: I3590f2ab7e6f58a9bfea16997e2d50a31619edf0