Added support for constant