Use new context syntax + simplified