Refactored source node states