Add Expert class