Added consumer and context