Added clustering and domains to help handle errors.