Updated the Table definitions to support the reshaped request