Added variable use in expressions