diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/utils/Util.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/utils/Util.java
index 7081bb276..a32478119 100644
--- a/dbus-java-core/src/main/java/org/freedesktop/dbus/utils/Util.java
+++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/utils/Util.java
@@ -163,18 +163,33 @@ public static String upperCaseFirstChar(String _str) {
      * @return camel case string or input if nothing todo. Returns null if input was null.
      */
     public static String snakeToCamelCase(String _input) {
+        return toCamelCase("_", _input);
+    }
+
+    /**
+     * Converts a kabab-case-string to camel case string.
+     * <br>
+     * Eg. this-is-kebab-case &rarr; thisIsSnakeCase
+     * @param _input string
+     * @return camel case string or input if nothing todo. Returns null if input was null.
+     */
+    public static String kebabToCamelCase(String _input) {
+        return toCamelCase("-", _input);
+    }
+
+    private static String toCamelCase(String _delimiter, String _input) {
         if (isBlank(_input)) {
             return _input;
         }
 
-        Pattern compile = Pattern.compile("_[a-zA-Z]");
+        Pattern compile = Pattern.compile(Pattern.quote(_delimiter) + "[a-zA-Z0-9]");
         Matcher matcher = compile.matcher(_input);
 
         String result = _input;
 
         while (matcher.find()) {
             String match = matcher.group();
-            String replacement = match.replace("_", "");
+            String replacement = match.replace(_delimiter, "");
             replacement = replacement.toUpperCase();
 
             result = result.replaceFirst(match, replacement);
diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/utils/UtilTest.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/utils/UtilTest.java
index 5b3bb88db..f40d634d0 100644
--- a/dbus-java-tests/src/test/java/org/freedesktop/dbus/utils/UtilTest.java
+++ b/dbus-java-tests/src/test/java/org/freedesktop/dbus/utils/UtilTest.java
@@ -21,4 +21,15 @@ void testRequireMinimum(String _name, int _minVal, int _testVal, boolean _throws
             assertEquals(_testVal, result);
         }
     }
+
+    @ParameterizedTest(name = "{index}: {0}")
+    @CsvSource({
+        "No Snake,This is no snake,This is no snake",
+        "Snake,This_is_a_snake,ThisIsASnake",
+        "Partial Snake,This_is_partial snake,ThisIsPartial snake",
+        "Snake with numbers,This_is_0_8_15_snake,ThisIs0815Snake",
+    })
+    void testSnakeToCamelCase(String _name, String _input, String _expected) {
+        assertEquals(_expected, Util.snakeToCamelCase(_input));
+    }
 }
diff --git a/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/ClassBuilderInfo.java b/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/ClassBuilderInfo.java
index e0720fe70..2b4bd48a8 100644
--- a/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/ClassBuilderInfo.java
+++ b/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/ClassBuilderInfo.java
@@ -1,9 +1,16 @@
 package org.freedesktop.dbus.utils.generator;
 
+import org.freedesktop.dbus.annotations.DBusBoundProperty;
 import org.freedesktop.dbus.annotations.DBusInterfaceName;
+import org.freedesktop.dbus.annotations.DBusMemberName;
+import org.freedesktop.dbus.messages.Message;
 import org.freedesktop.dbus.utils.Util;
 import org.freedesktop.dbus.utils.bin.IdentifierMangler;
+import org.freedesktop.dbus.utils.generator.ClassBuilderInfo.AnnotationInfo.AnnotArgs;
+import org.slf4j.LoggerFactory;
 
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
 import java.io.File;
 import java.lang.annotation.Annotation;
 import java.util.*;
@@ -19,7 +26,9 @@
  */
 public class ClassBuilderInfo {
 
-    private static final String DEFAULT_INDENT = "    ";
+    private static final Set<String>     RESERVED_METHOD_NAMES = getReservedMethods(Message.class);
+
+    private static final String          DEFAULT_INDENT        = "    ";
     /** Imported files for this class. */
     private final Set<String>            imports               = new TreeSet<>();
     /** Annotations of this class. */
@@ -159,17 +168,19 @@ public String createClassFileContent() {
      * @return
      */
     private List<String> createClassFileContent(boolean _staticClass, Set<String> _otherImports) {
-        List<String> content = new ArrayList<>();
 
         final String classIndent = _staticClass ? DEFAULT_INDENT : "";
         final String memberIndent = _staticClass ? DEFAULT_INDENT.repeat(2) : DEFAULT_INDENT;
 
         Set<String> allImports = new TreeSet<>();
         allImports.addAll(getImports());
+
         if (_otherImports != null) {
             allImports.addAll(_otherImports);
         }
 
+        List<String> content = new ArrayList<>();
+
         if (!_staticClass) {
             content.add("package " + getPackageName() + ";");
             content.add("");
@@ -188,6 +199,8 @@ private List<String> createClassFileContent(boolean _staticClass, Set<String> _o
 
         for (AnnotationInfo annotation : annotations) {
             allImports.add(annotation.getAnnotationClass().getName());
+            allImports.addAll(annotation.getAdditionalImports().stream().map(Class::getName).toList());
+
             String annotationCode = classIndent + "@" + annotation.getAnnotationClass().getSimpleName();
             if (annotation.getAnnotationParams() != null) {
                 annotationCode += "(" + annotation.getAnnotationParams() + ")";
@@ -222,7 +235,11 @@ private List<String> createClassFileContent(boolean _staticClass, Set<String> _o
         // add member fields
         for (MemberOrArgument member : members) {
             if (!member.getAnnotations().isEmpty()) {
-                content.addAll(member.getAnnotations().stream().map(l -> memberIndent + l).toList());
+                member.getAnnotations().stream().forEach(l -> {
+                   content.add(memberIndent + l.getAnnotationString());
+                   allImports.addAll(l.getAdditionalImports().stream().map(Class::getName).toList());
+                   allImports.add(l.getAnnotationClass().getName());
+                });
             }
             content.add(memberIndent + "private " + member.asOneLineString(allImports, "", false) + ";");
         }
@@ -265,6 +282,9 @@ private List<String> createClassFileContent(boolean _staticClass, Set<String> _o
                     .filter(l -> l.contains(".")) // no dots in name means this is only a class name so we are in same package and don't need to import
                     .map(l -> "import " + l + ";")
                     .toList());
+        } else {
+            // add the collected additional imports to the provided set when creating inner class
+            _otherImports.addAll(allImports);
         }
 
         return content;
@@ -367,6 +387,28 @@ static Set<String> getImportsForType(String _type) {
         return imports;
     }
 
+    static Set<String> getReservedMethods(Class<?> _class) {
+        try {
+            return Arrays.stream(Introspector.getBeanInfo(_class).getMethodDescriptors())
+                .map(e -> e.getMethod().getName())
+                .collect(Collectors.toSet());
+        } catch (IntrospectionException _ex) {
+            LoggerFactory.getLogger(ClassBuilderInfo.class).error("Could not extract method names from {}", _class, _ex);
+            return Set.of();
+        }
+    }
+
+    /**
+     * Check if the provided method name classes with any method name found in {@link #RESERVED_METHOD_NAMES}.
+     * Will check the given method name with usual Java method prefixes (get/is/set) as well.
+     * @param _methodName method name
+     * @return true if reserved
+     */
+    static boolean isReservedMethodName(String _methodName) {
+        return RESERVED_METHOD_NAMES.contains(_methodName) || RESERVED_METHOD_NAMES.contains("set" + _methodName)
+            || RESERVED_METHOD_NAMES.contains("get" + _methodName) || RESERVED_METHOD_NAMES.contains("is" + _methodName);
+    }
+
     /**
      * Contains information about annotation to place on classes, members or methods.
      *
@@ -374,23 +416,124 @@ static Set<String> getImportsForType(String _type) {
      * @since v3.2.1 - 2019-11-13
      */
     public static class AnnotationInfo {
+
         /** Annotation class. */
         private final Class<? extends Annotation> annotationClass;
-        /** Annotation params (e.g. value = "foo", key = "bar"). */
-        private final String                      annotationParams;
+        /** Map of parameters for the annotation (should be ordered). */
+        private final Map<String, Object> annotationParams = new LinkedHashMap<>();
 
-        public AnnotationInfo(Class<? extends Annotation> _annotationClass, String _annotationParams) {
+        private final Set<Class<?>> additionalImports = new LinkedHashSet<>();
+
+        public AnnotationInfo(Class<? extends Annotation> _annotationClass, AnnotArgs _annotationParams) {
             annotationClass = _annotationClass;
-            annotationParams = _annotationParams;
+            if (_annotationParams != null) {
+                _annotationParams.args.forEach(e -> {
+                    annotationParams.put(e.key(), e.value());
+                    if (e.value() != null && !e.value().getClass().getPackage().getName().startsWith("java.lang")) {
+                        additionalImports.add(e.value().getClass());
+                    }
+                });
+            }
         }
 
         public Class<? extends Annotation> getAnnotationClass() {
             return annotationClass;
         }
 
-        public String getAnnotationParams() {
+        public Map<String, Object> getAnnotationParams() {
             return annotationParams;
         }
+
+        public Set<Class<?>> getAdditionalImports() {
+            return additionalImports;
+        }
+
+        public String getAnnotationString() {
+            StringBuilder sb = new StringBuilder();
+            sb.append("@").append(getAnnotationClass().getSimpleName());
+
+            if (!getAnnotationParams().isEmpty()) {
+                sb.append("(");
+
+                if (getAnnotationParams().size() == 1 && "value".equals(getAnnotationParams().keySet().iterator().next())) {
+                    sb.append(handleArg(getAnnotationParams().values().iterator().next()));
+                } else {
+                    getAnnotationParams().forEach((k, v) -> {
+                        sb.append(k).append(" = ");
+                        sb.append(handleArg(v));
+                    });
+                }
+
+                sb.append(")");
+            }
+
+            return sb.toString();
+        }
+
+        @Override
+        public String toString() {
+            return "AnnotationInfo [annotationClass=" + annotationClass + ", annotationParams=" + annotationParams + ", additionalImports=" + additionalImports + "]";
+        }
+
+        private String handleArg(Object _value) {
+            if (_value instanceof String s) {
+                return "\"" + s + "\"";
+            } else {
+                return String.valueOf(_value);
+            }
+        }
+
+        public static final class AnnotArgs {
+            private final Set<AnnotArg> args = new LinkedHashSet<>();
+
+            private AnnotArgs() {
+
+            }
+
+            public AnnotArgs add(String _key, Object _val) {
+                Objects.requireNonNull(_key);
+                Objects.requireNonNull(_val);
+
+                args.add(new AnnotArg(_key, _val));
+                return this;
+            }
+
+            /**
+             * Shortcut for {@code #add("value", _val)}.
+             * @param _val value to set for "value" option
+             * @return this
+             */
+            public AnnotArgs add(Object _val) {
+                return this.add("value", _val);
+            }
+
+            public static AnnotArgs create() {
+                return new AnnotArgs();
+            }
+
+            record AnnotArg(String key, Object value) {
+
+                @Override
+                public int hashCode() {
+                    return Objects.hash(key);
+                }
+
+                @Override
+                public boolean equals(Object _obj) {
+                    if (this == _obj) {
+                        return true;
+                    }
+                    if (_obj == null) {
+                        return false;
+                    }
+                    if (getClass() != _obj.getClass()) {
+                        return false;
+                    }
+                    AnnotArg other = (AnnotArg) _obj;
+                    return Objects.equals(key, other.key);
+                }
+            }
+        }
     }
 
     /**
@@ -402,24 +545,31 @@ public String getAnnotationParams() {
     public static class ClassMethod {
 
         private static final String METHOD_TEMPL = """
-            %s%s %s(%s);
+            %s%s %s%s(%s);
             """;
 
         /** Name of this method. */
         private final String                 name;
         /** Return value of the method. */
         private final String                 returnType;
+        /** Prefix for method name (e.g. get or is), {@code null} if not needed. */
+        private final String                 methodPrefix;
         /** True if method should be final, false otherwise. */
         private final boolean                finalMethod;
         /** Arguments for this method, key is argument name, value is argument type. */
-        private final List<MemberOrArgument> arguments   = new ArrayList<>();
+        private final List<MemberOrArgument> arguments    = new ArrayList<>();
         /** List of annotations for this method. */
-        private final List<String>           annotations = new ArrayList<>();
+        private final List<AnnotationInfo>   annotations  = new ArrayList<>();
 
         public ClassMethod(String _name, String _returnType, boolean _finalMethod) {
+            this(_name, _returnType, null, _finalMethod);
+        }
+
+        public ClassMethod(String _name, String _returnType, String _methodPrefix, boolean _finalMethod) {
             name = _name;
             returnType = _returnType;
             finalMethod = _finalMethod;
+            methodPrefix = _methodPrefix;
         }
 
         public String getName() {
@@ -430,6 +580,10 @@ public String getReturnType() {
             return returnType;
         }
 
+        public String getMethodPrefix() {
+            return methodPrefix;
+        }
+
         public boolean isFinalMethod() {
             return finalMethod;
         }
@@ -438,27 +592,53 @@ public List<MemberOrArgument> getArguments() {
             return arguments;
         }
 
-        public List<String> getAnnotations() {
+        public List<AnnotationInfo> getAnnotations() {
             return annotations;
         }
 
         public List<String> generateCode(boolean _isInterface, String _argumentPrefix, String _indent, Set<String> _allImports) {
             List<String> result = new ArrayList<>();
-            if (!getAnnotations().isEmpty()) {
-                result.addAll(getAnnotations().stream().map(a -> _indent + a).toList());
+
+            String methodName = Util.kebabToCamelCase(Util.snakeToCamelCase(getName()));
+
+            List<AnnotationInfo> currentAnnotations = new ArrayList<>(getAnnotations());
+
+            // java method name differs from bus method name -> add annotation to mitigate
+            if (!getName().equals(methodName)) {
+                if (currentAnnotations.stream().anyMatch(e -> e.getAnnotationClass() == DBusBoundProperty.class)) {
+                    currentAnnotations.stream().filter(e -> e.getAnnotationClass() == DBusBoundProperty.class)
+                    .forEach(e -> e.getAnnotationParams().put("name", getName()));
+                } else {
+                    currentAnnotations.add(new AnnotationInfo(DBusMemberName.class, AnnotArgs.create().add(getName())));
+                }
+            }
+
+            if (!currentAnnotations.isEmpty()) {
+                result.addAll(currentAnnotations.stream().map(a -> _indent + a.getAnnotationString()).toList());
             }
 
             String publicModifier = !_isInterface ? "public " : "";
             String mthReturnType = getReturnType() == null ? "void"
                 : TypeConverter.getProperJavaClass(getReturnType(), _allImports);
             String args = "";
+
             if (!getArguments().isEmpty()) {
                 args += getArguments().stream()
                     .map(e -> e.asOneLineString(_allImports, _argumentPrefix, true))
                         .collect(Collectors.joining(", "));
             }
 
-            METHOD_TEMPL.formatted(publicModifier, mthReturnType, getName(), args)
+            String prefix = "";
+            if (!Util.isBlank(getMethodPrefix())) {
+                methodName = Util.upperCaseFirstChar(methodName);
+                prefix = getMethodPrefix();
+            }
+
+            if (isReservedMethodName(methodName) || isReservedMethodName(prefix + methodName)) {
+                methodName += methodName + "FromBus";
+            }
+
+            METHOD_TEMPL.formatted(publicModifier, mthReturnType, prefix, methodName, args)
                 .lines().map(l -> _indent + l).forEach(result::add);
 
             return result;
@@ -474,6 +654,8 @@ public List<String> generateCode(boolean _isInterface, String _argumentPrefix, S
      */
     public static class MemberOrArgument {
 
+        private static final String GETTER_SETTER_ANNOTATION = "@%s(\"%s\")";
+
         private static final String GETTER_TEMPL = """
             public %s get%s() {
             %sreturn %s;
@@ -495,7 +677,7 @@ public static class MemberOrArgument {
         /** List of classes/types or placeholders put into diamond operators to use as generics. */
         private final List<String> generics    = new ArrayList<>();
         /** List of annotations for this member. */
-        private final List<String> annotations = new ArrayList<>();
+        private final List<AnnotationInfo> annotations = new ArrayList<>();
 
         public MemberOrArgument(String _name, String _type, boolean _finalMember) {
             // repair reserved words by adding 'Param' as appendix, and when start with _ too
@@ -508,7 +690,7 @@ public MemberOrArgument(String _name, String _type) {
             this(_name, _type, false);
         }
 
-        public List<String> getAnnotations() {
+        public List<AnnotationInfo> getAnnotations() {
             return annotations;
         }
 
@@ -553,7 +735,7 @@ public String asOneLineString(Set<String> _allImports, String _prefix, boolean _
             }
 
             if (_includeAnnotations && !getAnnotations().isEmpty()) {
-                sb.append(String.join(" ", getAnnotations()))
+                sb.append(String.join(" ", getAnnotations().stream().map(e -> e.getAnnotationString()).toList()))
                         .append(" ");
             }
 
@@ -574,14 +756,33 @@ public List<String> generateCode(String _indent, String _prefix, Set<String> _al
                 memberType += "<" + getGenerics().stream().map(c -> TypeConverter.convertJavaType(c, false)).collect(Collectors.joining(", ")) + ">";
             }
 
-            String getterSetterName = Util.snakeToCamelCase(Util.upperCaseFirstChar(getName()));
+            String getterSetterName = Util.kebabToCamelCase(Util.snakeToCamelCase(Util.upperCaseFirstChar(getName())));
+
+            String getterAnnotation = "";
+
+            if (isReservedMethodName(getterSetterName)) {
+                getterAnnotation = GETTER_SETTER_ANNOTATION.formatted(DBusMemberName.class.getSimpleName(), getterSetterName);
+
+                if (isReservedMethodName(getterSetterName)) {
+                    _allImports.add(DBusMemberName.class.getName());
+                }
+
+                getterSetterName += "FromBus";
+            }
+
             if (!isFinalArg()) {
+                if (!Util.isBlank(getterAnnotation)) {
+                    result.add(_indent + getterAnnotation);
+                }
                 SETTER_TEMPL.formatted(getterSetterName, memberType,
                     maybePrefix("arg", _prefix), DEFAULT_INDENT, getName(), maybePrefix("arg", _prefix))
                         .lines().map(l -> _indent + l).forEach(result::add);
             }
 
             addEmptyLineIfNeeded(result);
+            if (!Util.isBlank(getterAnnotation)) {
+                result.add(_indent + getterAnnotation);
+            }
             GETTER_TEMPL.formatted(memberType, getterSetterName, DEFAULT_INDENT, getName())
                 .lines().map(l -> _indent + l).forEach(result::add);
 
@@ -657,13 +858,14 @@ public List<String> generatedCode(String _indent, String _className, String _arg
             if (!getSuperArguments().isEmpty()) {
                 assignments = " ".repeat(_indent.length() / 2) + "super(" + getSuperArguments().stream()
                     .map(e -> maybePrefix(e.getName(), _argumentPrefix))
-                    .collect(Collectors.joining(", ")) + ");";
+                    .collect(Collectors.joining(", ")) + ");" + System.lineSeparator();
             }
 
             if (!getArguments().isEmpty()) {
                 List<String> assigns = new ArrayList<>();
+                String innerIndent = " ".repeat(_indent.length() / 2);
                 for (MemberOrArgument e : getArguments()) {
-                    assigns.add(_indent + "this." + e.getName() + " = " + maybePrefix(e.getName(), _argumentPrefix) + ";");
+                    assigns.add(innerIndent + "this." + e.getName() + " = " + maybePrefix(e.getName(), _argumentPrefix) + ";");
                 }
                 assignments += String.join(System.lineSeparator(), assigns);
             }
diff --git a/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/InterfaceCodeGenerator.java b/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/InterfaceCodeGenerator.java
index 25ea2a3c5..8d300bd40 100644
--- a/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/InterfaceCodeGenerator.java
+++ b/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/InterfaceCodeGenerator.java
@@ -19,6 +19,7 @@
 import org.freedesktop.dbus.utils.Util;
 import org.freedesktop.dbus.utils.XmlUtil;
 import org.freedesktop.dbus.utils.generator.ClassBuilderInfo.*;
+import org.freedesktop.dbus.utils.generator.ClassBuilderInfo.AnnotationInfo.AnnotArgs;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -47,6 +48,8 @@
  */
 public class InterfaceCodeGenerator {
 
+    private static final String STRUCT_CLASS_SUFFIX = "Struct";
+
     private final DocumentBuilderFactory docFac = DocumentBuilderFactory.newInstance();
     private final Logger                 logger = LoggerFactory.getLogger(getClass());
 
@@ -186,7 +189,8 @@ private Map<File, String> extractAll(Element _ife) throws IOException, DBusExcep
         interfaceClass.setClassName(className);
         if (forcePackageName != null) {
             interfaceClass.getAnnotations().add(new AnnotationInfo(DBusInterfaceName.class,
-                "\"" + originalPackageName + "." + className + "\""));
+                AnnotArgs.create().add(originalPackageName + "." + className)
+                ));
         }
         interfaceClass.setExtendClass(DBusInterface.class.getName());
 
@@ -197,7 +201,7 @@ private Map<File, String> extractAll(Element _ife) throws IOException, DBusExcep
             switch (element.getTagName().toLowerCase()) {
                 case "method" -> additionalClasses.addAll(extractMethods(element, interfaceClass));
                 case "property" -> additionalClasses.addAll(extractProperties(element, interfaceClass));
-                case "signal" -> extractSignals(element, interfaceClass);
+                case "signal" -> additionalClasses.addAll(extractSignals(element, interfaceClass));
             }
         }
 
@@ -214,11 +218,12 @@ private Map<File, String> extractAll(Element _ife) throws IOException, DBusExcep
      *
      * @param _signalElement signal xml element
      * @param _clzBldr {@link ClassBuilderInfo} object
+     * @return list containing additionally created class or empty list
      *
      * @throws IOException on IO Error
      * @throws DBusException on DBus Error
      */
-    private void extractSignals(Element _signalElement, ClassBuilderInfo _clzBldr) throws IOException, DBusException {
+    private List<ClassBuilderInfo> extractSignals(Element _signalElement, ClassBuilderInfo _clzBldr) throws IOException, DBusException {
 
         String className = _signalElement.getAttribute("name");
         if (className.contains(".")) {
@@ -234,6 +239,7 @@ private void extractSignals(Element _signalElement, ClassBuilderInfo _clzBldr) t
 
         _clzBldr.getInnerClasses().add(innerClass);
         List<MemberOrArgument> argsList = new ArrayList<>();
+        List<ClassBuilderInfo> additionalClasses = new ArrayList<>();
 
         if (!_signalElement.hasChildNodes()) { // signal without any input/output?!
             logger.info("Signal without any input/output arguments. Creating empty signal class: {}", innerClass.getFqcn());
@@ -244,8 +250,11 @@ private void extractSignals(Element _signalElement, ClassBuilderInfo _clzBldr) t
 
             int unknownArgCnt = 0;
             for (Element argElm : signalArgs) {
-                String argType = TypeConverter.getJavaTypeFromDBusType(argElm.getAttribute("type"), _clzBldr.getImports());
+                // _clzBldr, additionalClasses, methodElementName, argElm, argName
                 String argName = Util.snakeToCamelCase(argElm.getAttribute("name"));
+
+                String argType =  extractOrCreateArgType(_clzBldr, additionalClasses, className, argElm.getAttribute("type"), argName);
+                TypeConverter.getJavaTypeFromDBusType(argElm.getAttribute("type"), _clzBldr.getImports());
                 if (Util.isBlank(argName)) {
                     argName = "arg" + unknownArgCnt;
                     unknownArgCnt++;
@@ -269,6 +278,8 @@ private void extractSignals(Element _signalElement, ClassBuilderInfo _clzBldr) t
         classConstructor.getSuperArguments().addAll(argsList);
 
         innerClass.getConstructors().add(classConstructor);
+
+        return additionalClasses;
     }
 
     /**
@@ -300,13 +311,7 @@ private List<ClassBuilderInfo> extractMethods(Element _methodElement, ClassBuild
                 String argType;
                 String argName = argElm.getAttribute("name");
 
-                if (argElm.getAttribute("type").contains("(")) { // this argument requires some sort of struct
-                    String structPart = argElm.getAttribute("type").replaceAll("(\\(.+\\))", "$1");
-                    String paramName = Util.defaultString(Util.upperCaseFirstChar(Util.snakeToCamelCase(argName)), "");
-                    argType = buildStructClass(structPart, methodElementName + paramName + "Struct", _clzBldr, additionalClasses);
-                } else {
-                    argType = TypeConverter.getJavaTypeFromDBusType(argElm.getAttribute("type"), _clzBldr.getImports());
-                }
+                argType = extractOrCreateArgType(_clzBldr, additionalClasses, methodElementName, argElm.getAttribute("type"), argName);
 
                 if (Util.isBlank(argName)) {
                     argName = "arg" + unknownArgNameCnt;
@@ -331,7 +336,7 @@ private List<ClassBuilderInfo> extractMethods(Element _methodElement, ClassBuild
                 List<String> genericTypes = new ArrayList<>();
 
                 if (avoidUsingTuple) {
-                    resultType = buildStructClass(dbusSignatures, methodElementName + "Struct", _clzBldr, additionalClasses);
+                    resultType = buildStructClass(dbusSignatures, methodElementName + STRUCT_CLASS_SUFFIX, _clzBldr, additionalClasses);
                 } else {
                     resultType = createTuple(outputArgs, methodElementName + "Tuple", _clzBldr, additionalClasses, genericTypes);
                 }
@@ -370,6 +375,24 @@ private List<ClassBuilderInfo> extractMethods(Element _methodElement, ClassBuild
 
     }
 
+    private String extractOrCreateArgType(ClassBuilderInfo _clzBldr, List<ClassBuilderInfo> _additionalClasses,
+        String _methodElementName, String _argTypeStringFromElement, String _argName) throws DBusException {
+        String argType;
+        if (_argTypeStringFromElement.contains("(")) { // this argument requires some sort of struct
+            String structPart = _argTypeStringFromElement.replaceAll("(\\(.+\\))", "$1");
+            String paramName = Util.defaultString(Util.upperCaseFirstChar(Util.snakeToCamelCase(_argName)), "");
+            String parentType = buildStructClass(structPart, _methodElementName + paramName + STRUCT_CLASS_SUFFIX, _clzBldr, _additionalClasses);
+            if (parentType != null) {
+                argType = parentType;
+            } else {
+                argType = null;
+            }
+        } else {
+            argType = TypeConverter.getJavaTypeFromDBusType(_argTypeStringFromElement, _clzBldr.getImports());
+        }
+        return argType;
+    }
+
     /**
      * Extract &lt;property&gt; elements properties.
      *
@@ -410,7 +433,7 @@ private List<ClassBuilderInfo> extractProperties(Element _propertyElement, Class
         } else if (attrType.contains("(")) {
             // contains structure
             String structPart = attrType.replaceAll("(\\(.+\\))", "$1");
-            type = buildStructClass(structPart, "Property" + attrName + "Struct", _clzBldr, additionalClasses);
+            type = buildStructClass(structPart, "Property" + attrName + STRUCT_CLASS_SUFFIX, _clzBldr, additionalClasses);
             isStruct = true;
         } else {
             type = TypeConverter.getJavaTypeFromDBusType(attrType, _clzBldr.getImports());
@@ -444,34 +467,41 @@ private List<ClassBuilderInfo> extractProperties(Element _propertyElement, Class
 
                 String rtnType = origType != null ? origType : clzzName;
 
-                ClassMethod classMethod = new ClassMethod(
-                    ("boolean".equalsIgnoreCase(clzzName) ? "is" : "get") + attrName, rtnType, false);
+                String methodPrefix = "boolean".equalsIgnoreCase(clzzName) ? "is" : "get";
+                ClassMethod classMethod = new ClassMethod(attrName, rtnType, methodPrefix, false);
                 _clzBldr.getMethods().add(classMethod);
 
+                AnnotArgs annotArgs = AnnotArgs.create();
+
                 if (propertyTypeRef != null) {
-                    classMethod.getAnnotations().add("@" + DBusBoundProperty.class.getSimpleName() + "(type = " + propertyTypeRef.getClassName() + ".class)");
+                    annotArgs.add("type", propertyTypeRef.getClassName() + ".class");
                 } else if (isStruct) {
-                    classMethod.getAnnotations().add("@" + DBusBoundProperty.class.getSimpleName() + "(type = " + clzzName + ".class)");
-                } else {
-                    classMethod.getAnnotations().add("@" + DBusBoundProperty.class.getSimpleName());
+                    annotArgs.add("type", clzzName + ".class");
                 }
+
+                classMethod.getAnnotations().add(new AnnotationInfo(DBusBoundProperty.class, annotArgs));
+
                 _clzBldr.getImports().add(DBusBoundProperty.class.getName());
             }
 
             if (DBusProperty.Access.WRITE.getAccessName().equals(attrAccess)
                 || DBusProperty.Access.READ_WRITE.getAccessName().equals(attrAccess)) {
-                ClassMethod classMethod = new ClassMethod("set" + attrName, "void", false);
+
+                ClassMethod classMethod = new ClassMethod(attrName, "void", "set", false);
                 classMethod.getArguments().add(new MemberOrArgument(attrName.substring(0, 1).toLowerCase() + attrName.substring(1), clzzName));
                 _clzBldr.getMethods().add(classMethod);
-                classMethod.getAnnotations().add("@" + DBusBoundProperty.class.getSimpleName());
+
+                classMethod.getAnnotations().add(new AnnotationInfo(DBusBoundProperty.class, null));
+
                 _clzBldr.getImports().add(DBusBoundProperty.class.getName());
             }
         } else {
-            String annotationParams = "name = \"" + attrName + "\", "
-                + "type = " + clzzName + ".class, "
-                + "access = " + DBusProperty.Access.class.getSimpleName() + "." + access;
+            AnnotArgs annotArgs = AnnotArgs.create()
+                .add("name", attrName)
+                .add("type", clzzName)
+                .add("access", DBusProperty.Access.class.getSimpleName() + "." + access);
 
-            AnnotationInfo annotationInfo = new AnnotationInfo(DBusProperty.class, annotationParams);
+            AnnotationInfo annotationInfo = new AnnotationInfo(DBusProperty.class, annotArgs);
             _clzBldr.getAnnotations().add(annotationInfo);
         }
 
@@ -511,7 +541,7 @@ private String createTuple(List<MemberOrArgument> _outputArgs, String _className
             String genericName = findNextGenericName(genericTypes.keySet());
 
             genericTypes.put(genericName, entry.getType());
-            entry.getAnnotations().add("@Position(" + position++ + ")");
+            entry.getAnnotations().add(new AnnotationInfo(Position.class, AnnotArgs.create().add(position++)));
             entry.setType(genericName);
             cnstrctArgs.add(new MemberOrArgument(entry.getName(), genericName));
         }
@@ -587,7 +617,7 @@ private String buildStructClass(List<DuoData> _dbusTypeStr, String _structName,
             String structClassName;
 
             if (data.dbusSig().contains("(")) {
-                String subStructFqcn = structFqcn + Util.upperCaseFirstChar(Objects.toString(data.name(), "")) + "Struct";
+                String subStructFqcn = structFqcn + Util.upperCaseFirstChar(Objects.toString(data.name(), "")) + STRUCT_CLASS_SUFFIX;
                 structClassName = new StructTreeBuilder(argumentPrefix, generatedStructClassNames)
                     .buildStructClasses(data.dbusSig(), subStructFqcn, _packageName, _structClasses);
             } else {
@@ -597,9 +627,8 @@ private String buildStructClass(List<DuoData> _dbusTypeStr, String _structName,
             }
 
             MemberOrArgument argument = new MemberOrArgument(data.name(), structClassName, true);
-            argument.getAnnotations().add("@Position(" + i + ")");
+            argument.getAnnotations().add(new AnnotationInfo(Position.class, AnnotArgs.create().add(i)));
             root.getMembers().add(argument);
-            root.getImports().add(Position.class.getName());
 
             classConstructor.getArguments().add(new MemberOrArgument(data.name(), structClassName));
         }
diff --git a/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/StructTreeBuilder.java b/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/StructTreeBuilder.java
index e7927f776..a506694a8 100644
--- a/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/StructTreeBuilder.java
+++ b/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/StructTreeBuilder.java
@@ -5,6 +5,8 @@
 import org.freedesktop.dbus.annotations.Position;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.utils.Util;
+import org.freedesktop.dbus.utils.generator.ClassBuilderInfo.AnnotationInfo;
+import org.freedesktop.dbus.utils.generator.ClassBuilderInfo.AnnotationInfo.AnnotArgs;
 import org.freedesktop.dbus.utils.generator.ClassBuilderInfo.ClassConstructor;
 import org.freedesktop.dbus.utils.generator.ClassBuilderInfo.ClassType;
 import org.freedesktop.dbus.utils.generator.ClassBuilderInfo.MemberOrArgument;
@@ -137,7 +139,7 @@ private ClassBuilderInfo createNested(List<StructTree> _list, String _structFqcn
         for (StructTree inTree : _list) {
 
             MemberOrArgument member = new MemberOrArgument("member" + position, inTree.getDataType().getName(), true);
-            member.getAnnotations().add("@Position(" + position + ")");
+            member.getAnnotations().add(new AnnotationInfo(Position.class, AnnotArgs.create().add(position)));
 
             String constructorArg = "member" + position;
 
@@ -181,8 +183,6 @@ private ClassBuilderInfo createNested(List<StructTree> _list, String _structFqcn
                 retval = null;
             }
 
-            root.getImports().add(Position.class.getName()); // add position annotation as include
-
             root.getImports().add(inTree.getDataType().getName());
             root.getMembers().add(member);
         }
diff --git a/dbus-java-utils/src/test/java/org/freedesktop/dbus/utils/generator/InterfaceCodeGeneratorTest.java b/dbus-java-utils/src/test/java/org/freedesktop/dbus/utils/generator/InterfaceCodeGeneratorTest.java
index be7e130c0..5d592fb87 100644
--- a/dbus-java-utils/src/test/java/org/freedesktop/dbus/utils/generator/InterfaceCodeGeneratorTest.java
+++ b/dbus-java-utils/src/test/java/org/freedesktop/dbus/utils/generator/InterfaceCodeGeneratorTest.java
@@ -17,10 +17,14 @@
 class InterfaceCodeGeneratorTest {
 
     static InterfaceCodeGenerator loadDBusXmlFile(File _inputFile, String _objectPath, String _busName) {
+        return loadDBusXmlFile(false, _inputFile, _objectPath, _busName);
+    }
+
+    static InterfaceCodeGenerator loadDBusXmlFile(boolean _createPropertyMethods, File _inputFile, String _objectPath, String _busName) {
         if (!Util.isBlank(_busName)) {
             String introspectionData = Util.readFileToString(_inputFile);
 
-            return new InterfaceCodeGenerator(false, introspectionData, _objectPath, _busName, null, false, null, false);
+            return new InterfaceCodeGenerator(false, introspectionData, _objectPath, _busName, null, _createPropertyMethods, null, false);
         } else {
             fail("No valid busName given");
         }
@@ -66,6 +70,66 @@ void testCreateNetworkManagerWirelessInterface() throws Exception {
         assertFalse(clzContent.contains("this._interfaceName"));
     }
 
+    @Test
+    void testHandleKebabCase() throws Exception {
+        InterfaceCodeGenerator ci2 = loadDBusXmlFile(true,
+                new File("src/test/resources/CreateInterface/xdg-desktop/org.freedesktop.portal.PowerProfileMonitor.xml"),
+                "/", "org.freedesktop.portal.PowerProfileMonitor");
+        Map<File, String> analyze = ci2.analyze(true);
+
+        assertEquals(1, analyze.size());
+
+        String clzContent = analyze.get(analyze.keySet().iterator().next());
+
+        assertTrue(clzContent.contains("@DBusBoundProperty(name = \"power-saver-enabled\")"));
+        assertTrue(clzContent.contains("boolean isPowerSaverEnabled();"));
+    }
+
+    @Test
+    void testHandleReservedMethodNames() throws Exception {
+        InterfaceCodeGenerator ci2 = loadDBusXmlFile(true,
+                new File("src/test/resources/CreateInterface/xdg-desktop/org.freedesktop.portal.Clipboard.xml"),
+                "/", "org.freedesktop.portal.Clipboard");
+        Map<File, String> analyze = ci2.analyze(true);
+
+        assertEquals(1, analyze.size());
+
+        String clzContent = analyze.get(analyze.keySet().iterator().next());
+
+        assertTrue(clzContent.contains("@DBusMemberName(\"Serial\")"));
+        assertTrue(clzContent.contains("public UInt32 getSerialFromBus()"));
+    }
+
+    @Test
+    void testHandleStructSignals() throws Exception {
+        InterfaceCodeGenerator ci2 = loadDBusXmlFile(true,
+            new File("src/test/resources/CreateInterface/xdg-desktop/org.freedesktop.portal.GlobalShortcuts.xml"),
+            "/", "org.freedesktop.portal.GlobalShortcuts");
+        Map<File, String> analyze = ci2.analyze(true);
+
+        assertEquals(3, analyze.size());
+
+        String primaryFile = analyze.entrySet().stream()
+            .filter(e -> e.getKey().getName().equals("GlobalShortcuts.java"))
+            .findFirst()
+            .orElseThrow()
+            .getValue();
+
+        assertTrue(primaryFile.contains("public ShortcutsChanged(String path, DBusPath sessionHandle, List<ShortcutsChangedShortcutsStruct> shortcuts) throws DBusException {"));
+        assertTrue(primaryFile.contains("private final List<ShortcutsChangedShortcutsStruct> shortcuts;"));
+        assertTrue(primaryFile.contains("public List<ShortcutsChangedShortcutsStruct> getShortcuts() {"));
+
+        String secondaryFile = analyze.entrySet().stream()
+            .filter(e -> e.getKey().getName().equals("ShortcutsChangedShortcutsStruct.java"))
+            .findFirst()
+            .orElseThrow()
+            .getValue();
+
+        assertTrue(secondaryFile.contains("private final String member0;"));
+        assertTrue(secondaryFile.contains("private final Map<String, Variant<?>> member1;"));
+
+    }
+
     @Test
     void testCreateSampleStructArgs() throws Exception {
         InterfaceCodeGenerator ci2 = loadDBusXmlFile(
diff --git a/dbus-java-utils/src/test/resources/CreateInterface/xdg-desktop/org.freedesktop.portal.Clipboard.xml b/dbus-java-utils/src/test/resources/CreateInterface/xdg-desktop/org.freedesktop.portal.Clipboard.xml
new file mode 100644
index 000000000..bff08821f
--- /dev/null
+++ b/dbus-java-utils/src/test/resources/CreateInterface/xdg-desktop/org.freedesktop.portal.Clipboard.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 2022 Google LLC
+
+ SPDX-License-Identifier: LGPL-2.1-or-later
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<node name="/"
+  xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+  <!--
+      org.freedesktop.portal.Clipboard
+      @short_description: Clipboard portal
+
+      The Clipboard portal allows sessions to access the clipboard.
+
+      This documentation describes version 1 of this interface.
+  -->
+  <interface name="org.freedesktop.portal.Clipboard">
+    <!-- 
+        RequestClipboard:
+        @session_handle: Object path for the :ref:`org.freedesktop.portal.Session` object
+        @options: Vardict with optional further information
+
+        Requests clipboard access for the given portal session. This request
+        must be made before the session starts. The session must be started,
+        before using any other method in this interface which take a session.
+        Note that other interfaces might place restriction on when it's possible
+        to interact with the clipboard.
+
+        This portal does NOT create it's own session. Instead, it offers existing sessions
+        created from other portals the option to integrate with the clipboard.
+
+        For whether this interface is supported for a given session, refer to that portal's
+        documentation.
+        See :ref:`org.freedesktop.portal.RemoteDesktop` to integrate clipboard with the
+        remote desktop session.
+        See :ref:`org.freedesktop.portal.InputCapture` to integrate clipboard with the
+        input capture session.
+    -->
+    <method name="RequestClipboard">
+      <arg type="o" name="session_handle" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+    </method>
+    <!-- 
+        SetSelection:
+        @session_handle: Object path for the :ref:`org.freedesktop.portal.Session` object
+        @options: Vardict with optional further information
+
+        Sets the owner of the clipboard formats in ``mime_types`` in @options to
+        the session, i.e. this session has data for the advertised clipboard formats.
+
+        See :ref:`org.freedesktop.portal.FileTransfer` to transfer files using the
+        ``application/vnd.portal.filetransfer`` mimetype.
+
+        May only be called if clipboard access was given after starting the session.
+
+        Supported keys in the @options vardict include:
+
+        * ``mime_types`` (``as``)
+
+          A list of mime types that the session has clipboard content for.
+     -->
+    <method name="SetSelection">
+      <arg type="o" name="session_handle" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+    </method>
+    <!--
+        SelectionWrite:
+        @session_handle: Object path for the :ref:`org.freedesktop.portal.Session` object
+        @serial: The serial of the request where this answer is directed towards
+        @fd: A UnixFD handle to the contents of the selection being written to
+
+        Answer to 'SelectionTransfer' signal. Transfers the clipboard content for
+        the given serial to the method callee via a file descriptor.
+        It is the Callee that creates the file descriptor.
+
+        May only be called if clipboard access was given after starting the session.
+    -->
+    <method name="SelectionWrite">
+      <annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="u" name="serial" direction="in"/>
+      <arg type="h" name="fd" direction="out"/>
+    </method>
+    <!-- 
+        SelectionWriteDone:
+        @session_handle: Object path for the :ref:`org.freedesktop.portal.Session` object
+        @serial: The serial of the request where this answer is directed to
+        @success: A boolean which indicates whether the transfer of the clipboard data was successful (``true``) or not (``false``)
+
+        Notifies that the transfer of the clipboard data has either completed
+        successfully, or failed.
+
+        May only be called if clipboard access was given after starting the session.
+     -->
+    <method name="SelectionWriteDone">
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="u" name="serial" direction="in"/>
+      <arg type="b" name="success" direction="in"/>
+    </method>
+    <!-- 
+        SelectionRead:
+        @session_handle: Object path for the :ref:`org.freedesktop.portal.Session` object
+        @mime_type: The MIME type string of the requested format
+        @fd: A UnixFD handle to the contents of the selection being read
+
+        Transfer the clipboard content given the specified mime type to the
+        method caller via a file descriptor.
+
+        The creation of the file descriptor is the responsibility of the callee.
+
+        May only be called if clipboard access was given after starting the session.
+    -->
+    <method name="SelectionRead">
+      <annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="s" name="mime_type" direction="in"/>
+      <arg type="h" name="fd" direction="out"/>
+    </method>
+    <!-- 
+        SelectionOwnerChanged:
+        @session_handle: Object path for the :ref:`org.freedesktop.portal.Session` object
+        @options: Vardict with optional further information
+
+        Notifies the session that the clipboard selection has changed.
+
+        Caller will only be notified if clipboard access was given after starting the session.
+
+        Supported keys in the @options vardict include:
+
+        * ``mime_types`` (``as``)
+
+          A list of MIME types for which the new clipboard selection has content
+
+        * ``session_is_owner`` (``b``)
+
+          A boolean for whether the session is the owner of the clipboard selection ('true') or not ('false')
+     -->
+    <signal name="SelectionOwnerChanged">
+      <arg type="o" name="session_handle" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantMap"/>
+      <arg type="a{sv}" name="options" direction="out"/>
+    </signal>
+    <!-- 
+        SelectionTransfer:
+        @session_handle: Object path for the :ref:`org.freedesktop.portal.Session` object
+        @mime_type: The mime-type string of the requested format
+        @serial: The serial used to track this transfer, to which the answer of this request must use
+
+        Notifies the session of a request for clipboard content of the given mime type.  The 
+        callee provides a serial to track the request, which any 
+        org.freedesktop.portal.Clipboard.SelectionWrite() responses must use.
+
+        Once the caller is done handling the 'SelectionTransfer' request, they must call
+        org.freedesktop.portal.Clipboard.SelectionWriteDone() with the corresponding request's serial
+        and whether the request completed successfully. If the request is not handled, the caller should
+        respond by setting 'success' to 'false'.
+
+        Caller will only be notified if clipboard access was given after starting the session.
+     -->
+    <signal name="SelectionTransfer">
+      <arg type="o" name="session_handle" direction="out"/>
+      <arg type="s" name="mime_type" direction="out"/>
+      <arg type="u" name="serial" direction="out"/>
+    </signal>
+
+    <property name="version" type="u" access="read"/>
+  </interface>
+</node>
diff --git a/dbus-java-utils/src/test/resources/CreateInterface/xdg-desktop/org.freedesktop.portal.GlobalShortcuts.xml b/dbus-java-utils/src/test/resources/CreateInterface/xdg-desktop/org.freedesktop.portal.GlobalShortcuts.xml
new file mode 100644
index 000000000..26b2fb753
--- /dev/null
+++ b/dbus-java-utils/src/test/resources/CreateInterface/xdg-desktop/org.freedesktop.portal.GlobalShortcuts.xml
@@ -0,0 +1,279 @@
+<?xml version="1.0"?>
+<!--
+ Copyright (C) 2022 Aleix Pol Gonzalez <aleixpol@kde.org>
+
+ SPDX-License-Identifier: LGPL-2.1-or-later
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+ Author: Aleix Pol Gonzalez <aleixpol@kde.org>
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+  <!--
+      org.freedesktop.portal.GlobalShortcuts:
+      @short_description: Portal for managing global shortcuts
+
+      This portal lets applications create global shortcuts sessions, and
+      register shortcuts to them. These shortcuts are activated regardless of
+      the focused state of the application window.
+
+      To use this portal, applications have to create a session under which its
+      actions will be collected. Then shortcuts can be bound (see
+      org.freedesktop.portal.GlobalShortcuts.Bind), and listed (see
+      org.freedesktop.portal.GlobalShortcuts.ListShortcuts).
+
+      All global shortcuts are bound to a session, and all sessions are bound to
+      the application that created them.
+
+      The #org.freedesktop.portal.GlobalShortcuts::Activated and
+      #org.freedesktop.portal.GlobalShortcuts::Deactivated signals are emitted,
+      respectively, whenever a shortcut is activated and deactivated.
+
+      This documentation describes version 2 of this interface.
+  -->
+  <interface name="org.freedesktop.portal.GlobalShortcuts">
+    <!--
+        CreateSession:
+        @options: Vardict with optional further information
+        @handle: Object path for the :ref:`org.freedesktop.portal.Request` object representing this call
+
+        Creates a global shortcuts session.
+
+        Supported keys in the @options vardict include:
+
+        * ``handle_token`` (``s``)
+
+          A string that will be used as the last element of the @handle. Must be a valid
+          object path element. See the org.freedesktop.portal.Request documentation for
+          more information about the @handle.
+
+        * ``session_handle_token`` (``s``)
+
+          A string that will be used as the last element of the session handle. Must be a valid
+          object path element. See the org.freedesktop.portal.Session documentation for
+          more information about the session handle.
+
+        The following results get returned via the :ref:`org.freedesktop.portal.Request::Response` signal:
+
+        * ``session_handle`` (``s``)
+
+          The session handle. An object path for the
+          org.freedesktop.portal.Session object representing the created
+          session.
+
+          .. note::
+            The ``session_handle`` is an object path that was erroneously implemented
+            as ``s``. For backwards compatibility it will remain this type.
+    -->
+    <method name="CreateSession">
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <arg type="o" name="handle" direction="out"/>
+    </method>
+
+    <!--
+        BindShortcuts:
+        @session_handle: Object path for the :ref:`org.freedesktop.portal.Session` object representing the session
+        @shortcuts: The list of shortcuts to bind
+        @parent_window: Identifier for the application window, see :doc:`window-identifiers`
+        @options: Vardict with optional further information
+        @request_handle: Object path for the :ref:`org.freedesktop.portal.Request` object representing this call
+
+        Bind the shortcuts. This will typically result the portal presenting a
+        dialog showing the shortcuts and allowing users to configure the shortcuts.
+        An application can only attempt bind shortcuts of a session once.
+
+        Each element of the @shortcuts array is a tuple composed of a shortcut id,
+        and a vardict with the following keys:
+
+        * ``description`` (``s``)
+
+          User-readable text describing what the shortcut does.
+
+        * ``preferred_trigger`` (``s``)
+
+          The preferred shortcut trigger, defined as described by the
+          `shortcuts XDG specification <https://specifications.freedesktop.org/shortcuts-spec/latest/>`__.
+          Optional.
+
+        Supported keys in the @options vardict include:
+
+        * ``handle_token`` (``s``)
+
+          A string that will be used as the last element of the
+          @handle. Must be a valid object path element. See the
+          :ref:`org.freedesktop.portal.Request` documentation for more
+          information about the @handle.
+
+        The following results get returned via the ref::`org.freedesktop.portal.Request::Response` signal:
+
+        * ``shortcuts`` (``a(sa{sv})``)
+
+          The list of shortcuts which were bound. This is a subset of the
+          shortcuts which were passed in from the @shortcuts variable of this
+          method (this includes the set of all shortcuts and the empty set).
+          The keys they may contain are described below, and are different from
+          the keys in the @shortcuts variable of this method.
+
+        Each element of the @shortcuts array returned by the
+        :ref:`org.freedesktop.portal.Request::Response` signal is a tuple composed of
+        a shortcut id, and a vardict with the following keys:
+
+        * ``description`` (``s``)
+
+          User-readable text describing what the shortcut does.
+
+        * ``trigger_description`` (``s``)
+
+          User-readable text describing how to trigger the shortcut for the
+          client to render.
+    -->
+    <method name="BindShortcuts">
+      <arg type="o" name="session_handle" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QList&lt;QPair&lt;QString,QVariantMap&gt;&gt;"/>
+      <arg type="a(sa{sv})" name="shortcuts" direction="in"/>
+      <arg type="s" name="parent_window" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In3" value="QVariantMap"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <arg type="o" name="request_handle" direction="out"/>
+    </method>
+
+    <!--
+        ListShortcuts:
+        @session_handle: Object path for the :ref:`org.freedesktop.portal.Session` object representing the session
+        @options: Vardict with optional further information
+
+        Lists shortcuts of a session.
+
+        If `BindShortcuts` was called for `session` all active shortcuts for `session` are returned.
+        Otherwise returns the shortcuts that were sucessfully bound in a previous session by this application.
+
+        Supported keys in the @options vardict include:
+
+        * ``handle_token`` (``s``)
+
+          A string that will be used as the last element of the
+          @handle. Must be a valid object path element. See the
+          :ref:`org.freedesktop.portal.Request` documentation for more
+          information about the @handle.
+
+        The following results get returned via the :ref:`org.freedesktop.portal.Request::Response` signal:
+
+        * ``shortcuts`` (``a(sa{sv})``)
+
+          A list of shortcuts.
+
+          See the :ref:`org.freedesktop.portal.Request::Response` signal of the
+          org.freedesktop.portal.GlobalShortcuts.BindShortcuts() method for
+          the list of supported properties of shortcuts.
+    -->
+    <method name="ListShortcuts">
+      <arg type="o" name="session_handle" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <arg type="o" name="request_handle" direction="out"/>
+    </method>
+
+    <!--
+        ConfigureShortcuts:
+        @session_handle: Object path for the :ref:`org.freedesktop.portal.Session` object representing the session
+        @parent_window: Identifier for the application window, see :doc:`window-identifiers`
+        @options: Vardict with optional further information
+
+        Request showing a configuration UI so the user is able to configure all shortcuts of this session.
+
+        Supported keys in the @options vardict include:
+
+        * ``activation_token`` (``s``)
+
+          A token that can be used to activate the configuration window.
+
+        This method was added in version 2 of this interface.
+    -->
+    <method name="ConfigureShortcuts">
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="s" name="parent_window" direction="in" />
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QVariantMap"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+    </method>
+
+    <!--
+        Activated:
+        @session_handle: Session that requested the shortcut
+        @shortcut_id: the application-provided ID for the notification
+        @timestamp: the time of activation with millisecond granularity, with an undefined base.
+        @options: Vardict with optional further information
+
+        Notifies about a shortcut becoming active.
+
+        Supported keys in the @options vardict include:
+
+        * ``activation_token`` (``s``)
+
+          A token that can be used to activate a window in response to the
+          shortcut getting activated.
+    -->
+    <signal name="Activated">
+      <arg type="o" name="session_handle" direction="out"/>
+      <arg type="s" name="shortcut_id" direction="out"/>
+      <arg type="t" name="timestamp" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out3" value="QVariantMap"/>
+      <arg type="a{sv}" name="options" direction="out"/>
+    </signal>
+
+    <!--
+        Deactivated:
+        @session_handle: Session that requested the shortcut
+        @shortcut_id: the application-provided ID for the notification
+        @timestamp: the time of deactivation with millisecond granularity, with an undefined base.
+        @options: Vardict with optional further information
+
+        Notifies that a shortcut is not active anymore.
+
+        Supported keys in the @options vardict include:
+
+        * ``activation_token`` (``s``)
+
+          A token that can be used to activate a window in response to the
+          shortcut getting deactivated.
+    -->
+    <signal name="Deactivated">
+      <arg type="o" name="session_handle" direction="out"/>
+      <arg type="s" name="shortcut_id" direction="out"/>
+      <arg type="t" name="timestamp" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out3" value="QVariantMap"/>
+      <arg type="a{sv}" name="options" direction="out"/>
+    </signal>
+
+    <!--
+        ShortcutsChanged:
+        @session_handle: Session that requested the shortcut
+        @shortcuts: The different shortcuts that have been registered. See org.freedesktop.portal.GlobalShortcuts.
+
+        Indicates that the information associated with some of the shortcuts has changed.
+
+        See the :ref:`org.freedesktop.portal.Request::Response` signal of the
+        org.freedesktop.portal.GlobalShortcuts.BindShortcuts() method for the
+        list of supported properties of shortcuts.
+    -->
+    <signal name="ShortcutsChanged">
+      <arg type="o" name="session_handle" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QList&lt;QPair&lt;QString,QVariantMap&gt;&gt;"/>
+      <arg type="a(sa{sv})" name="shortcuts" direction="out"/>
+    </signal>
+
+    <property name="version" type="u" access="read"/>
+  </interface>
+</node>
diff --git a/dbus-java-utils/src/test/resources/CreateInterface/xdg-desktop/org.freedesktop.portal.PowerProfileMonitor.xml b/dbus-java-utils/src/test/resources/CreateInterface/xdg-desktop/org.freedesktop.portal.PowerProfileMonitor.xml
new file mode 100644
index 000000000..ecd748ed9
--- /dev/null
+++ b/dbus-java-utils/src/test/resources/CreateInterface/xdg-desktop/org.freedesktop.portal.PowerProfileMonitor.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+ Copyright (C) 2021 Red Hat, Inc.
+
+ SPDX-License-Identifier: LGPL-2.1-or-later
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+ Authors: Bastien Nocera <hadess@hadess.net>
+-->
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+  <!--
+      org.freedesktop.portal.PowerProfileMonitor:
+      @short_description: Power Profile monitoring portal
+
+      The Power Profile Monitor interface provides information about the
+      user-selected system-wide power profile, to sandboxed applications.
+      It is not a portal in the strict sense, since it does not involve
+      user interaction. Applications are expected to use this interface
+      indirectly, via a library API such as the GLib GPowerProfileMonitor interface.
+
+      This documentation describes version 1 of this interface.
+  -->
+  <interface name="org.freedesktop.portal.PowerProfileMonitor">
+    <!--
+        power-saver-enabled:
+
+        Whether “Power Saver” mode is enabled on the system.
+    -->
+    <property name="power-saver-enabled" type="b" access="read"/>
+
+    <property name="version" type="u" access="read"/>
+  </interface>
+</node>