Updated to new config nodes