Addded support for constant