Refactorint and graph individuals functionality