Added custom host renaming support