Included hostname. Refactor