diff --git a/src/objects/aff/zcl_abapgit_object_nont.clas.abap b/src/objects/aff/zcl_abapgit_object_nont.clas.abap
new file mode 100644
index 000000000..0d64d5b62
--- /dev/null
+++ b/src/objects/aff/zcl_abapgit_object_nont.clas.abap
@@ -0,0 +1,38 @@
+CLASS zcl_abapgit_object_nont DEFINITION
+  PUBLIC
+  INHERITING FROM zcl_abapgit_object_common_aff
+  CREATE PUBLIC.
+
+  PUBLIC SECTION.
+    METHODS zif_abapgit_object~changed_by REDEFINITION.
+
+  PRIVATE SECTION.
+    CONSTANTS co_table_name TYPE tabname VALUE 'NONT_HEADER'.
+ENDCLASS.
+
+
+
+CLASS zcl_abapgit_object_nont IMPLEMENTATION.
+  METHOD zif_abapgit_object~changed_by.
+    DATA: lv_user  TYPE string,
+          lx_error TYPE REF TO cx_root.
+
+    TRY.
+
+        SELECT SINGLE changed_by INTO lv_user
+            FROM (co_table_name)
+            WHERE nont_name = ms_item-obj_name AND version = 'I'.
+
+        IF lv_user IS INITIAL.
+          SELECT SINGLE changed_by INTO lv_user
+            FROM (co_table_name)
+            WHERE nont_name = ms_item-obj_name AND version = 'A'.
+        ENDIF.
+
+        rv_user = lv_user.
+
+      CATCH cx_root INTO lx_error.
+        zcx_abapgit_exception=>raise_with_text( lx_error ).
+    ENDTRY.
+  ENDMETHOD.
+ENDCLASS.
diff --git a/src/objects/aff/zcl_abapgit_object_nont.clas.xml b/src/objects/aff/zcl_abapgit_object_nont.clas.xml
new file mode 100644
index 000000000..0bb13448b
--- /dev/null
+++ b/src/objects/aff/zcl_abapgit_object_nont.clas.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_CLAS" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <VSEOCLASS>
+    <CLSNAME>ZCL_ABAPGIT_OBJECT_NONT</CLSNAME>
+    <LANGU>E</LANGU>
+    <DESCRIPT>ABAPGIT Objecthandler for SAP Object Node Type (NONT)</DESCRIPT>
+    <STATE>1</STATE>
+    <CLSCCINCL>X</CLSCCINCL>
+    <FIXPT>X</FIXPT>
+    <UNICODE>X</UNICODE>
+   </VSEOCLASS>
+  </asx:values>
+ </asx:abap>
+</abapGit>