Some follow up updates to contain docs in table objects