Refactoring and adding expert