Fixes #98 - Add clustering support