More mods for table schema selection