Refactoring
add configuration for clustering