Updated room structure