Updated parser to return the tps