added support for constants