Added host aliasing