Add SearchRoom and so on