Adds evaluation parsing support