Added clustering support