Add rudimentary parsing of data