Updated parser structure