Added invalidator. Going to refactor it back to node now.