Replaced simple parsing with Recursive Descent Parser