Improve hops management.