Using context instead of channel