add parsing for all data