Refactored ExpertExtender