Split TableReader and YamlReader into separate readers