Fix dependencies
Support multiline expressions