Add choice between local and remote version