Add room number and adapt parser