Add experts support