Added contextvisitor