Major updates to updateTable building functions