Added context passing.