Improve: detecting host