improved comma-separated classes for better performance.