Add parsing for underlying data formats