Add support for --remote-config