Added support for room numbers