Add goal expression
Improve parser