Added support for constant definitions