Add expression field. Make endpoint configurable