diff --git a/nautilus/src/nautilus/tracing/tag/TagRecorder.cpp b/nautilus/src/nautilus/tracing/tag/TagRecorder.cpp
index 9cb744a9..e915907a 100644
--- a/nautilus/src/nautilus/tracing/tag/TagRecorder.cpp
+++ b/nautilus/src/nautilus/tracing/tag/TagRecorder.cpp
@@ -9,133 +9,29 @@ namespace nautilus::tracing {
 
 #pragma GCC diagnostic ignored "-Wframe-address"
 
-static void* getReturnAddress(uint32_t offset) {
-	switch (offset) {
-	case 0:
-		return __builtin_return_address(0 + 1);
-	case 1:
-		return __builtin_return_address(1 + 1);
-	case 2:
-		return __builtin_return_address(2 + 1);
-	case 3:
-		return __builtin_return_address(3 + 1);
-	case 4:
-		return __builtin_return_address(4 + 1);
-	case 5:
-		return __builtin_return_address(5 + 1);
-	case 6:
-		return __builtin_return_address(6 + 1);
-	case 7:
-		return __builtin_return_address(7 + 1);
-	case 8:
-		return __builtin_return_address(8 + 1);
-	case 9:
-		return __builtin_return_address(9 + 1);
-	case 10:
-		return __builtin_return_address(10 + 1);
-	case 11:
-		return __builtin_return_address(11 + 1);
-	case 12:
-		return __builtin_return_address(12 + 1);
-	case 13:
-		return __builtin_return_address(13 + 1);
-	case 14:
-		return __builtin_return_address(14 + 1);
-	case 15:
-		return __builtin_return_address(15 + 1);
-	case 16:
-		return __builtin_return_address(16 + 1);
-	case 17:
-		return __builtin_return_address(17 + 1);
-	case 18:
-		return __builtin_return_address(18 + 1);
-	case 19:
-		return __builtin_return_address(19 + 1);
-	case 20:
-		return __builtin_return_address(20 + 1);
-	case 21:
-		return __builtin_return_address(21 + 1);
-	case 22:
-		return __builtin_return_address(22 + 1);
-	case 23:
-		return __builtin_return_address(23 + 1);
-	case 24:
-		return __builtin_return_address(24 + 1);
-	case 25:
-		return __builtin_return_address(25 + 1);
-	case 26:
-		return __builtin_return_address(26 + 1);
-	case 27:
-		return __builtin_return_address(27 + 1);
-	case 28:
-		return __builtin_return_address(28 + 1);
-	case 29:
-		return __builtin_return_address(29 + 1);
-	case 30:
-		return __builtin_return_address(30 + 1);
-	case 31:
-		return __builtin_return_address(31 + 1);
-	case 32:
-		return __builtin_return_address(32 + 1);
-	case 33:
-		return __builtin_return_address(33 + 1);
-	case 34:
-		return __builtin_return_address(34 + 1);
-	case 35:
-		return __builtin_return_address(35 + 1);
-	case 36:
-		return __builtin_return_address(36 + 1);
-	case 37:
-		return __builtin_return_address(37 + 1);
-	case 38:
-		return __builtin_return_address(38 + 1);
-	case 39:
-		return __builtin_return_address(39 + 1);
-	case 40:
-		return __builtin_return_address(40 + 1);
-	case 41:
-		return __builtin_return_address(41 + 1);
-	case 42:
-		return __builtin_return_address(42 + 1);
-	case 43:
-		return __builtin_return_address(43 + 1);
-	case 44:
-		return __builtin_return_address(44 + 1);
-	case 45:
-		return __builtin_return_address(45 + 1);
-	case 46:
-		return __builtin_return_address(46 + 1);
-	case 47:
-		return __builtin_return_address(47 + 1);
-	case 48:
-		return __builtin_return_address(48 + 1);
-	case 49:
-		return __builtin_return_address(49 + 1);
-	case 50:
-		return __builtin_return_address(50 + 1);
-	case 51:
-		return __builtin_return_address(51 + 1);
-	case 52:
-		return __builtin_return_address(52 + 1);
-	case 53:
-		return __builtin_return_address(53 + 1);
-	case 54:
-		return __builtin_return_address(54 + 1);
-	case 55:
-		return __builtin_return_address(55 + 1);
-	case 56:
-		return __builtin_return_address(56 + 1);
-	case 57:
-		return __builtin_return_address(57 + 1);
-	case 58:
-		return __builtin_return_address(58 + 1);
-	case 59:
-		return __builtin_return_address(59 + 1);
-	case 60:
-		return __builtin_return_address(60 + 1);
-	default:
-		return nullptr;
+template<size_t StackSize>
+struct ReturnAddressHelper {
+	template<size_t Depth = 1>
+	static void* get_addr(size_t index){
+		if(index == StackSize){
+			return __builtin_return_address(StackSize + Depth);
+		}else{
+			return ReturnAddressHelper<StackSize-1>::template get_addr<Depth + 1>(index);
+		}
+	}
+};
+
+template<>
+struct ReturnAddressHelper<0>{
+	template<size_t Depth = 1>
+	static void* get_addr(size_t){
+		return __builtin_return_address(Depth);
 	}
+};
+
+static void* getReturnAddress(uint32_t offset) {
+	return ReturnAddressHelper<TagRecorder::MAX_TAG_SIZE>::get_addr(offset);
+
 }
 
 TagRecorder::TagRecorder(TagAddress startAddress) : startAddress(startAddress) {
diff --git a/nautilus/src/nautilus/tracing/tag/TagRecorder.hpp b/nautilus/src/nautilus/tracing/tag/TagRecorder.hpp
index 18f01215..0082f2c5 100644
--- a/nautilus/src/nautilus/tracing/tag/TagRecorder.hpp
+++ b/nautilus/src/nautilus/tracing/tag/TagRecorder.hpp
@@ -11,7 +11,7 @@ namespace nautilus::tracing {
  */
 class TagRecorder final {
 public:
-	static constexpr size_t MAX_TAG_SIZE = 60;
+	static constexpr size_t MAX_TAG_SIZE = 128;
 
 	/**
 	 * @brief Factory to create a new tag recorder.