Code change for singleton node