diff --git a/Intel8080/inc/Intel8080.h b/Intel8080/inc/Intel8080.h
index 40cdb52..a2b9018 100644
--- a/Intel8080/inc/Intel8080.h
+++ b/Intel8080/inc/Intel8080.h
@@ -45,9 +45,9 @@ namespace EightBit {
 		InputOutput& m_ports;
 
 		register16_t af;
-		register16_t bc = 0xffff;
-		register16_t de = 0xffff;
-		register16_t hl = 0xffff;
+		register16_t bc = Mask16;
+		register16_t de = Mask16;
+		register16_t hl = Mask16;
 
 		auto R(const int r) {
 			switch (r) {
diff --git a/inc/Bus.h b/inc/Bus.h
index 43e788d..65f6356 100644
--- a/inc/Bus.h
+++ b/inc/Bus.h
@@ -5,6 +5,7 @@
 #include <map>
 #include <vector>
 
+#include "Chip.h"
 #include "Signal.h"
 #include "Register.h"
 #include "EventArgs.h"
@@ -57,7 +58,7 @@ namespace EightBit {
 		void loadHexFile(std::string path);
 
 	private:
-		uint8_t m_data = 0xff;
-		register16_t m_address = 0xffff;
+		uint8_t m_data = Chip::Mask8;
+		register16_t m_address = Chip::Mask16;
 	};
 }
diff --git a/inc/IntelProcessor.h b/inc/IntelProcessor.h
index 8d838f0..2a0051f 100644
--- a/inc/IntelProcessor.h
+++ b/inc/IntelProcessor.h
@@ -169,7 +169,7 @@ namespace EightBit {
 
 	private:
 		std::array<opcode_decoded_t, 0x100> m_decodedOpcodes;
-		register16_t m_sp = 0xffff;
+		register16_t m_sp = Mask16;
 		register16_t m_memptr;
 	};
 }
diff --git a/inc/MemoryMapping.h b/inc/MemoryMapping.h
index 35428d3..e2fa9b4 100644
--- a/inc/MemoryMapping.h
+++ b/inc/MemoryMapping.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdint>
+#include "Chip.h"
 
 namespace EightBit {
 
@@ -11,7 +12,7 @@ namespace EightBit {
 		enum AccessLevel { Unknown, ReadOnly, ReadWrite, };
 
 		Memory& memory;
-		uint16_t begin = 0xffff;
+		uint16_t begin = Chip::Mask16;
 		uint16_t mask = 0U;
 		AccessLevel access = Unknown;
 	};