Updated parser to show more relevant data