Distro detection improvement, some support for cluster