Refactored cluster and hit configuration for more flexibility