Updated room model