Added Completion logic into the Context.