Passing context as extra parameters (Additional data) fixes 171