Adapt remote-driver to new architecture