PR for code review

Avoid using static instance of a context.