Start refactor custom experts