Improve security in Room controller