Enhanced clustering support