Add some marker class
Add node state
Fix