Adding hostname resolution