* Modifications to have hostname