Yes. CSM Disabled & Secure Boot Disabled = UEFI Class 3 CSM Disabled & Secure Boot Enabled = UEFI Class 3+