Add host name field and token docstring-