Now supports single-node mode