Add optional arguments with remote branch and server name