added support for constants in expressions