Added clustering to app