Use AST parser for constraint expressions
Update images