Added room number to address structure