Better clustering support