diff --git a/peppol-smp-client/src/main/java/com/helger/smpclient/peppol/ISMPServiceGroupProvider.java b/peppol-smp-client/src/main/java/com/helger/smpclient/peppol/ISMPServiceGroupProvider.java
index 3205754b..78e9e8b9 100644
--- a/peppol-smp-client/src/main/java/com/helger/smpclient/peppol/ISMPServiceGroupProvider.java
+++ b/peppol-smp-client/src/main/java/com/helger/smpclient/peppol/ISMPServiceGroupProvider.java
@@ -41,6 +41,22 @@ public interface ISMPServiceGroupProvider
    * @return The service group. Maybe <code>null</code>.
    * @throws SMPClientException
    *         in case something goes wrong
+   * @see #getServiceGroupOrNull(IParticipantIdentifier)
+   */
+  @Nonnull
+  ServiceGroupType getServiceGroup (@Nonnull IParticipantIdentifier aServiceGroupID) throws SMPClientException;
+
+  /**
+   * Returns a service group. A service group references to the service
+   * metadata. This is a specification compliant method.
+   *
+   * @param aServiceGroupID
+   *        The ID of the service group to retrieve. May not be
+   *        <code>null</code>.
+   * @return The service group. Maybe <code>null</code>.
+   * @throws SMPClientException
+   *         in case something goes wrong
+   * @see #getServiceGroup(IParticipantIdentifier)
    */
   @Nullable
   ServiceGroupType getServiceGroupOrNull (@Nonnull IParticipantIdentifier aServiceGroupID) throws SMPClientException;
diff --git a/peppol-smp-client/src/main/java/com/helger/smpclient/peppol/ISMPServiceMetadataProvider.java b/peppol-smp-client/src/main/java/com/helger/smpclient/peppol/ISMPServiceMetadataProvider.java
index b5508dd3..bcc3fb48 100644
--- a/peppol-smp-client/src/main/java/com/helger/smpclient/peppol/ISMPServiceMetadataProvider.java
+++ b/peppol-smp-client/src/main/java/com/helger/smpclient/peppol/ISMPServiceMetadataProvider.java
@@ -44,6 +44,27 @@
  */
 public interface ISMPServiceMetadataProvider
 {
+  /**
+   * Gets a signed service metadata object given by its service group id and its
+   * document type.<br>
+   * This is a specification compliant method.
+   *
+   * @param aServiceGroupID
+   *        The service group id of the service metadata to get. May not be
+   *        <code>null</code>.
+   * @param aDocumentTypeID
+   *        The document type of the service metadata to get. May not be
+   *        <code>null</code>.
+   * @return A signed service metadata object. Never <code>null</code>.
+   * @throws SMPClientException
+   *         in case something goes wrong
+   * @see #getServiceMetadataOrNull(IParticipantIdentifier,
+   *      IDocumentTypeIdentifier)
+   */
+  @Nonnull
+  SignedServiceMetadataType getServiceMetadata (@Nonnull final IParticipantIdentifier aServiceGroupID,
+                                                @Nonnull final IDocumentTypeIdentifier aDocumentTypeID) throws SMPClientException;
+
   /**
    * Gets a signed service metadata object given by its service group id and its
    * document type.<br>
@@ -58,6 +79,7 @@ public interface ISMPServiceMetadataProvider
    *         registration is present.
    * @throws SMPClientException
    *         in case something goes wrong
+   * @see #getServiceMetadata(IParticipantIdentifier, IDocumentTypeIdentifier)
    */
   @Nullable
   SignedServiceMetadataType getServiceMetadataOrNull (@Nonnull IParticipantIdentifier aServiceGroupID,