Added discovery addon classes