Added room and some additional pair functions