Add improved argument  parser and remote server