More setup changes to follow table layout changes