Features/correlation analysis refactoring