diff --git a/spring-custom-aop/spring-custom-aop/pom.xml b/spring-custom-aop/spring-custom-aop/pom.xml
index 7e9da03b54..0bab7a4057 100644
--- a/spring-custom-aop/spring-custom-aop/pom.xml
+++ b/spring-custom-aop/spring-custom-aop/pom.xml
@@ -2,7 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung</groupId>
-    <artifactId>spring-boot</artifactId>
+    <artifactId>spring-custom-aop</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>spring-boot</name>
diff --git a/spring-custom-aop/spring-custom-aop/src/main/java/org/baeldung/endpoints/EndpointDTO.java b/spring-custom-aop/spring-custom-aop/src/main/java/org/baeldung/endpoints/EndpointDTO.java
new file mode 100644
index 0000000000..d12d6419e1
--- /dev/null
+++ b/spring-custom-aop/spring-custom-aop/src/main/java/org/baeldung/endpoints/EndpointDTO.java
@@ -0,0 +1,39 @@
+package org.baeldung.endpoints;
+
+public class EndpointDTO {
+    private String id;
+    private boolean enabled;
+    private boolean sensitive;
+
+    public EndpointDTO(String id, boolean enabled, boolean sensitive) {
+        super();
+        this.id = id;
+        this.enabled = enabled;
+        this.sensitive = sensitive;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public boolean isSensitive() {
+        return sensitive;
+    }
+
+    public void setSensitive(boolean sensitive) {
+        this.sensitive = sensitive;
+    }
+
+}
diff --git a/spring-custom-aop/spring-custom-aop/src/main/java/org/baeldung/endpoints/ListEndpoints.java b/spring-custom-aop/spring-custom-aop/src/main/java/org/baeldung/endpoints/ListEndpoints.java
index 0add741a1f..f434351a51 100644
--- a/spring-custom-aop/spring-custom-aop/src/main/java/org/baeldung/endpoints/ListEndpoints.java
+++ b/spring-custom-aop/spring-custom-aop/src/main/java/org/baeldung/endpoints/ListEndpoints.java
@@ -1,6 +1,7 @@
 package org.baeldung.endpoints;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
@@ -8,16 +9,16 @@ import org.springframework.boot.actuate.endpoint.Endpoint;
 import org.springframework.stereotype.Component;
 
 @Component
-public class ListEndpoints extends AbstractEndpoint<List<Endpoint>> {
-    private List<Endpoint> endpoints;
+public class ListEndpoints extends AbstractEndpoint<List<EndpointDTO>> {
+    private List<EndpointDTO> endpointDTOs;
 
     @Autowired
     public ListEndpoints(List<Endpoint> endpoints) {
         super("listEndpoints");
-        this.endpoints = endpoints;
+        this.endpointDTOs = endpoints.stream().map(endpoint -> new EndpointDTO(endpoint.getId(), endpoint.isEnabled(), endpoint.isSensitive())).collect(Collectors.toList());
     }
 
-    public List<Endpoint> invoke() {
-        return this.endpoints;
+    public List<EndpointDTO> invoke() {
+        return this.endpointDTOs;
     }
 }
\ No newline at end of file