Eliminated dependencies on tableMaker