Refactor to expressions
Fix parsers