Expanded class hierarchy of StyleDiscovery