Added support for simple room linking