Improving the host groups structure