Added constants to expression generator