diff --git a/drivers/nvme/nvme.inc b/drivers/nvme/nvme.inc
index a1fc5ef..9b7cc8a 100644
--- a/drivers/nvme/nvme.inc
+++ b/drivers/nvme/nvme.inc
@@ -171,6 +171,45 @@ CSTS_PP = 1 shl 5
 AQA_ASQS = 0xfff
 AQA_ACQS = 0xfff shl 16
 
+; CDW10.SEL Values (Page 115 of NVMe 1.4 specification)
+CDW10_SEL_CURRENT = 000b
+CDW10_SEL_DEFAULT = 001b
+CDW10_SEL_SAVED = 010b
+CDW10_SEL_SUPPORTED_CAPABILITIES = 011b
+
+; Feature Identifiers (FID) Values (Page 206 of NVMe 1.4 specification)
+; Used in Get/Set Features Commands
+FID_ARBITRATION = 0x01
+FID_POWER_MANAGEMENT = 0x02
+FID_LBA_RANGE_TYPE = 0x03
+FID_TEMPERATURE_THRESHOLD = 0x04
+FID_ERROR_RECOVERY = 0x05
+FID_VOLATILE_WRITE_CACHE = 0x06
+FID_NUMBER_OF_QUEUES = 0x07
+FID_INTERRUPT_COALESCING = 0x08
+FID_INTERRUPT_VECTOR_CONFIGURATION = 0x09
+FID_WRITE_ATOMICITY_NORMAL = 0x0A
+FID_ASYNCHRONOUS_EVENT_CONFIGURATION = 0x0B
+FID_AUTONOMOUS_POWER_STATE_TRANSITION = 0x0C
+FID_HOST_MEMORY_BUFFER = 0x0D
+FID_TIMESTAMP = 0x0E
+FID_KEEP_ALIVE_TIMER = 0x0F
+FID_HOST_CONTROLLED_THERMAL_MANAGEMENT = 0x10
+FID_NON_OPERATIONAL_POWER_STATE_CONFIG = 0x11
+FID_READ_RECOVERY_LEVEL_CONFIG = 0x12
+FID_PREDICTABLE_LATENCY_MODE_CONFIG = 0x13
+FID_PREDICTABLE_LATENCY_MODE_WINDOW = 0x14
+FID_LBA_STATUS_INFORMATION_REPORT_INTERVAL = 0x15
+FID_HOST_BEHAVIOR_SUPPORT = 0x16
+FID_SANITIZE_CONFIG = 0x17
+FID_ENDURANCE_GROUP_EVENT_CONFIGURATION = 0x18
+; NVM Command Set Specific - FID
+FID_SOFTWARE_PROGRESS_MARKER = 0x80
+FID_HOST_IDENTIFIER = 0x81
+FID_RESERVATION_NOTIFICATION_MASK = 0x82
+FID_RESERVATION_PERSISTENCE = 0x83
+FID_NAMESPACE_WRITE_PROTECTION_CONFIG = 0x84
+
 struct NVME_MMIO 
 	CAP      dq ? ; Controller Capabilities
 	VS       dd ? ; Version