Added expression parsing