Refactoring
add configuration for clustering
add variable