Add possibility to give the hostname in args