Add clustering support