CircuitNode refactoring