Added constant support to context