Adding GlobalOptionsNode handling