Change class DataParser to just be Parser