Added support for use with other physical nodes