Adding hostname setup back