Added classification optimization to Plus
Added classification optimization to Times