diff --git a/src/zbp_hs_i_rappartner.clas.abap b/src/zbp_hs_i_rappartner.clas.abap
index 2bed4bf..131c912 100644
--- a/src/zbp_hs_i_rappartner.clas.abap
+++ b/src/zbp_hs_i_rappartner.clas.abap
@@ -1,15 +1,5 @@
-class ZBP_HS_I_RAPPARTNER definition
-  public
-  abstract
-  final
-  create public .
-
-public section.
-protected section.
-private section.
+CLASS zbp_hs_i_rappartner DEFINITION PUBLIC ABSTRACT FINAL FOR BEHAVIOR OF zhs_i_rappartner.
 ENDCLASS.
 
-
-
-CLASS ZBP_HS_I_RAPPARTNER IMPLEMENTATION.
+CLASS zbp_hs_i_rappartner IMPLEMENTATION.
 ENDCLASS.
diff --git a/src/zbp_hs_i_rappartner.clas.locals_imp.abap b/src/zbp_hs_i_rappartner.clas.locals_imp.abap
new file mode 100644
index 0000000..469b181
--- /dev/null
+++ b/src/zbp_hs_i_rappartner.clas.locals_imp.abap
@@ -0,0 +1,14 @@
+CLASS lhc_Partner DEFINITION INHERITING FROM cl_abap_behavior_handler.
+  PRIVATE SECTION.
+
+    METHODS get_instance_authorizations FOR INSTANCE AUTHORIZATION
+      IMPORTING keys REQUEST requested_authorizations FOR Partner RESULT result.
+
+ENDCLASS.
+
+CLASS lhc_Partner IMPLEMENTATION.
+
+  METHOD get_instance_authorizations.
+  ENDMETHOD.
+
+ENDCLASS.
diff --git a/src/zbp_hs_i_rappartner.clas.xml b/src/zbp_hs_i_rappartner.clas.xml
index 4a1b746..0bad88a 100644
--- a/src/zbp_hs_i_rappartner.clas.xml
+++ b/src/zbp_hs_i_rappartner.clas.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <abapGit version="v1.0.0" serializer="LCL_OBJECT_CLAS" serializer_version="v1.0.0">
- <asx:abap version="1.0" xmlns:asx="http://www.sap.com/abapxml"/>
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <VSEOCLASS>
+    <CLSNAME>ZBP_HS_I_RAPPARTNER</CLSNAME>
+    <LANGU>E</LANGU>
+    <DESCRIPT>Behavior Implementation for ZHS_I_RAPPARTNER</DESCRIPT>
+    <CATEGORY>06</CATEGORY>
+    <STATE>1</STATE>
+    <CLSCCINCL>X</CLSCCINCL>
+    <FIXPT>X</FIXPT>
+    <UNICODE>X</UNICODE>
+    <CLSDEFINT>ZHS_I_RAPPARTNER</CLSDEFINT>
+   </VSEOCLASS>
+  </asx:values>
+ </asx:abap>
 </abapGit>
diff --git a/src/zhs_i_rappartner.bdef.asbdef b/src/zhs_i_rappartner.bdef.asbdef
index 24a480f..aed0845 100644
--- a/src/zhs_i_rappartner.bdef.asbdef
+++ b/src/zhs_i_rappartner.bdef.asbdef
@@ -11,7 +11,7 @@ authorization master ( instance )
   update;
   delete;
 
-  mapping for zbs_dmo_partner
+  mapping for zhs_dmo_partner
     {
       PartnerNumber   = partner;
       PartnerName     = name;
diff --git a/src/zhs_i_rappartner.ddls.asddls b/src/zhs_i_rappartner.ddls.asddls
index 21079f3..fce31f4 100644
--- a/src/zhs_i_rappartner.ddls.asddls
+++ b/src/zhs_i_rappartner.ddls.asddls
@@ -1,5 +1,7 @@
 @AccessControl.authorizationCheck: #NOT_REQUIRED
 @EndUserText.label: 'RAP Interface for Partner'
+@Metadata.allowExtensions: true
+
 define root view entity ZHS_I_RAPPartner
   as select from zhs_dmo_partner
 {
diff --git a/src/zhs_i_rappartner.ddlx.asddlxs b/src/zhs_i_rappartner.ddlx.asddlxs
new file mode 100644
index 0000000..7332ea4
--- /dev/null
+++ b/src/zhs_i_rappartner.ddlx.asddlxs
@@ -0,0 +1,63 @@
+@Metadata.layer: #CUSTOMER
+annotate entity ZHS_I_RAPPartner
+    with 
+{
+@UI.facet      : [
+      {
+      id         : 'FacetCollection',
+      type       : #COLLECTION,
+      label      : 'Partner Collection'
+      },
+      {
+      id         : 'FacetPartnerAddress',
+      parentId   : 'FacetCollection',
+      label      : 'Address',
+      type       : #IDENTIFICATION_REFERENCE,
+      targetQualifier: 'PARTNER_ADDRESS'
+      },
+      {
+      id         : 'FacetPartnerFields',
+      parentId   : 'FacetCollection',
+      label      : 'Information',
+      type       : #IDENTIFICATION_REFERENCE,
+      targetQualifier: 'PARTNER_INFO'
+      }
+
+      ]
+    @UI.selectionField: [{ position: 10 }]
+      @UI.lineItem: [{ position: 20, importance: #MEDIUM }]
+      @UI.identification: [{ position: 20, qualifier: 'PARTNER_INFO' }]
+      @EndUserText.label: 'Partner'
+      @EndUserText.quickInfo: 'Identifier of the partner'
+      PartnerNumber;
+      
+      @UI.selectionField: [{ position: 20 }]
+      @UI.lineItem: [{ position: 10, importance: #MEDIUM }]
+      @UI.identification: [{ position: 30, qualifier: 'PARTNER_INFO' }]
+      @EndUserText.label: 'Name'
+      @EndUserText.quickInfo: 'Partner name'
+      PartnerName;
+      
+      @UI.lineItem: [{ position: 40, importance: #MEDIUM }]
+      @UI.identification: [{ position: 40, qualifier: 'PARTNER_ADDRESS' }]
+      @EndUserText.label: 'Street'
+      @EndUserText.quickInfo: 'Street and Housenumber'
+      Street;
+      
+      @UI.lineItem: [{ position: 30, importance: #MEDIUM }]
+      @UI.identification: [{ position: 50, qualifier: 'PARTNER_ADDRESS' }]
+      @EndUserText.label: 'City'
+      @EndUserText.quickInfo: 'City of the partner'
+      City;
+      
+      @UI.lineItem: [{ position: 50, importance: #HIGH}]
+      @UI.identification: [{ position: 60, qualifier: 'PARTNER_ADDRESS' }]
+      @EndUserText.label: 'Ctry'
+      @EndUserText.quickInfo: 'Country'
+      Country;
+      
+      @UI.identification: [{ position: 70, qualifier: 'PARTNER_INFO' }]
+      @EndUserText.label: 'PayCurr'
+      @EndUserText.quickInfo: 'Payment Currency'
+      PaymentCurrency;    
+}
\ No newline at end of file
diff --git a/src/zhs_i_rappartner.ddlx.xml b/src/zhs_i_rappartner.ddlx.xml
new file mode 100644
index 0000000..9afb4b2
--- /dev/null
+++ b/src/zhs_i_rappartner.ddlx.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_DDLX" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <DDLX>
+    <METADATA>
+     <NAME>ZHS_I_RAPPARTNER</NAME>
+     <DESCRIPTION>Metdata extension</DESCRIPTION>
+     <MASTER_LANGUAGE>EN</MASTER_LANGUAGE>
+    </METADATA>
+   </DDLX>
+  </asx:values>
+ </asx:abap>
+</abapGit>