Updates to Table Creation