Minor revision to Room.Map