Added multiple room handle
Merge branch 'feature/multiple-rooms'