refactored extra attribute cohort
Merge branch 'TestRefactoring'