Use explicit classes when available