Made most of the data parser