made change for code review feedback: use connection id in context instead of from parameter