Add clustering support to the webapp