Incomplete changes to move to a Table centric model