Update to Room mgr