diff --git a/Firmware/CameraControllerGen2/CameraControllerGen2.componentinfo.xml b/Firmware/CameraControllerGen2/CameraControllerGen2.componentinfo.xml
new file mode 100644
index 0000000..e275755
--- /dev/null
+++ b/Firmware/CameraControllerGen2/CameraControllerGen2.componentinfo.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Store xmlns:i="http://www.w3.org/2001/XMLSchema-instance" xmlns="AtmelPackComponentManagement">
+	<ProjectComponents />
+</Store>
\ No newline at end of file
diff --git a/Firmware/CameraControllerGen2/CameraControllerGen2.cppproj b/Firmware/CameraControllerGen2/CameraControllerGen2.cppproj
index 754966a..e7123d6 100644
--- a/Firmware/CameraControllerGen2/CameraControllerGen2.cppproj
+++ b/Firmware/CameraControllerGen2/CameraControllerGen2.cppproj
@@ -178,7 +178,7 @@
   <avrgcccpp.compiler.warnings.AllWarnings>True</avrgcccpp.compiler.warnings.AllWarnings>
   <avrgcccpp.linker.libraries.Libraries>
     <ListValues>
-      <Value>libATxmega32A4U-1.10.a</Value>
+      <Value>libATxmega32A4U-1.13.a</Value>
     </ListValues>
   </avrgcccpp.linker.libraries.Libraries>
   <avrgcccpp.linker.libraries.LibrarySearchPaths>
diff --git a/Firmware/CameraControllerGen2/app.c b/Firmware/CameraControllerGen2/app.c
index 08815b0..adf9407 100644
--- a/Firmware/CameraControllerGen2/app.c
+++ b/Firmware/CameraControllerGen2/app.c
@@ -44,7 +44,8 @@ void hwbp_app_initialize(void)
         APP_REGS_ADD_MAX - APP_REGS_ADD_MIN + 1,
         default_device_name,
 		  true,	// The device is able to repeat the harp timestamp clock
-		  false	// The device is not able to generate the harp timestamp clock
+		  false, // The device is not able to generate the harp timestamp clock
+		  3		// Default timestamp offset
     );
 }
 
diff --git a/Firmware/CameraControllerGen2/hwbp_core.h b/Firmware/CameraControllerGen2/hwbp_core.h
index aabd3cc..06f5f91 100644
--- a/Firmware/CameraControllerGen2/hwbp_core.h
+++ b/Firmware/CameraControllerGen2/hwbp_core.h
@@ -126,7 +126,8 @@ void core_func_start_core (
     const uint8_t num_of_app_registers,
     const uint8_t *device_name,
 	const bool	device_is_able_to_repeat_clock,
-	const bool	device_is_able_to_generate_clock
+	const bool	device_is_able_to_generate_clock,
+	const uint8_t default_timestamp_offset
 	);
 
 // Call this function in case of error
diff --git a/Firmware/CameraControllerGen2/hwbp_core_regs.h b/Firmware/CameraControllerGen2/hwbp_core_regs.h
index 06cdccb..1fd7b52 100644
--- a/Firmware/CameraControllerGen2/hwbp_core_regs.h
+++ b/Firmware/CameraControllerGen2/hwbp_core_regs.h
@@ -10,8 +10,8 @@
 #define ADD_R_HW_VERSION_H      0x01    // U8
 #define ADD_R_HW_VERSION_L      0x02    // U8
 #define ADD_R_ASSEMBLY_VERSION  0x03    // U8
-#define ADD_R_HARP_VERSION_H    0x04    // U8
-#define ADD_R_HARP_VERSION_L    0x05    // U8
+#define ADD_R_CORE_VERSION_H    0x04    // U8
+#define ADD_R_CORE_VERSION_L    0x05    // U8
 #define ADD_R_FW_VERSION_H      0x06    // U8
 #define ADD_R_FW_VERSION_L      0x07    // U8
 #define ADD_R_TIMESTAMP_SECOND  0x08    // U32
@@ -21,9 +21,10 @@
 #define ADD_R_DEVICE_NAME       0x0C    // U8
 #define ADD_R_SERIAL_NUMBER     0x0D    // U16
 #define ADD_R_CONFIG            0x0E    // U8
+#define ADD_R_TIMESTAMP_OFFSET  0x0F    // U8
 
 /* Memory limits */
-#define COMMON_BANK_ADD_MAX             0x0E
+#define COMMON_BANK_ADD_MAX             0x0F
 #define COMMON_BANK_ABSOLUTE_ADD_MAX    0x1C
 
 /* R_OPERATION_CTRL */
diff --git a/Firmware/CameraControllerGen2/hwbp_core_types.h b/Firmware/CameraControllerGen2/hwbp_core_types.h
index fc29bac..65892fe 100644
--- a/Firmware/CameraControllerGen2/hwbp_core_types.h
+++ b/Firmware/CameraControllerGen2/hwbp_core_types.h
@@ -26,9 +26,9 @@
 #define MSK_TIMESTAMP_AT_PAYLOAD	0x10
 
 /************************************************************************/
-/* Maximum size of an entire packet (header to chksum)                  */
+/* Maximum size of a received packet                                    */
 /************************************************************************/
-#define MAX_PACKET_SIZE				256
+#define MAX_PACKET_SIZE				255
 
 
 #endif /* _HWBP_CORE_TYPES_H_ */
\ No newline at end of file
diff --git a/Firmware/CameraControllerGen2/libATxmega32A4U-1.10.a b/Firmware/CameraControllerGen2/libATxmega32A4U-1.10.a
deleted file mode 100644
index 7dadd6e..0000000
Binary files a/Firmware/CameraControllerGen2/libATxmega32A4U-1.10.a and /dev/null differ
diff --git a/Firmware/CameraControllerGen2/libATxmega32A4U-1.13.a b/Firmware/CameraControllerGen2/libATxmega32A4U-1.13.a
new file mode 100644
index 0000000..2437ebb
Binary files /dev/null and b/Firmware/CameraControllerGen2/libATxmega32A4U-1.13.a differ
diff --git a/Firmware/LICENSE b/Firmware/LICENSE
index 729c67c..a6d761d 100644
--- a/Firmware/LICENSE
+++ b/Firmware/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2021-2022 Filipe Carvalho
+Copyright (C) 2021-2023 Filipe Carvalho
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in