Resource Wizard changes and Tabular Data Object changes