diff --git a/beacon-engine/pom.xml b/beacon-engine/pom.xml
index 318a24f..bbcc27c 100644
--- a/beacon-engine/pom.xml
+++ b/beacon-engine/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>br.gov.inmetro.beacon</groupId>
 	<artifactId>beacon-engine</artifactId>
-	<version>1.0.3.RELEASE</version>
+	<version>1.0.4.RELEASE</version>
 	<packaging>jar</packaging>
 
 	<name>beacon-engine</name>
diff --git a/beacon-engine/src/main/java/br/gov/inmetro/beacon/engine/domain/repository/PulsesRepositoryImpl.java b/beacon-engine/src/main/java/br/gov/inmetro/beacon/engine/domain/repository/PulsesRepositoryImpl.java
index 42aa1bd..0a370a1 100644
--- a/beacon-engine/src/main/java/br/gov/inmetro/beacon/engine/domain/repository/PulsesRepositoryImpl.java
+++ b/beacon-engine/src/main/java/br/gov/inmetro/beacon/engine/domain/repository/PulsesRepositoryImpl.java
@@ -22,7 +22,7 @@ public class PulsesRepositoryImpl implements PulsesQueries {
     @Transactional
     public PulseEntity last(Long chainIndex){
         Long lastPulseIndex = (Long) manager.createQuery(
-                "select max(p.pulseIndex) from PulseEntity p where p.chainIndex = :chainIndex")
+                "select max(p.id) from PulseEntity p where p.chainIndex = :chainIndex")
                 .setParameter("chainIndex", chainIndex)
                 .getSingleResult();
 
@@ -36,7 +36,7 @@ public PulseEntity last(Long chainIndex){
     @Transactional
     public PulseEntity first(Long chainIndex){
         Long firstPulseIndex = (Long) manager.createQuery(
-                "select min(p.pulseIndex) from PulseEntity p where p.chainIndex = :chainIndex")
+                "select min(p.id) from PulseEntity p where p.chainIndex = :chainIndex")
                 .setParameter("chainIndex", chainIndex)
                 .getSingleResult();
 
@@ -73,6 +73,23 @@ public PulseEntity findByChainAndPulseIndex(Long chainIndex, Long pulseIndex){
         }
     }
 
+    @Transactional(readOnly = true)
+    public PulseEntity findByChainAndPulseId(Long chainIndex, Long pulseId){
+        try {
+            PulseEntity recordEntity = (PulseEntity) manager
+                    .createQuery("from PulseEntity p " +
+                            "join fetch p.listValueEntities lve " +
+                            "where p.chainIndex = :chainIndex and p.pulseIndex = :pulseId")
+                    .setParameter("chainIndex", chainIndex)
+                    .setParameter("pulseId", pulseId)
+                    .getSingleResult();
+
+            return recordEntity;
+        } catch (NoResultException e){
+            return null;
+        }
+    }
+
     @Transactional(readOnly = true)
     public Pulse findOldPulses(Long chainIndex, ZonedDateTime timeStamp){
         try {
diff --git a/beacon-interface/pom.xml b/beacon-interface/pom.xml
index 0e64cb3..247b760 100644
--- a/beacon-interface/pom.xml
+++ b/beacon-interface/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>beacon-interface</artifactId>
-	<version>1.0.0.RELEASE</version>
+	<version>1.0.1.RELEASE</version>
 	<name>beacon-interface</name>
 	<description>Demo project for Spring Boot</description>
 
diff --git a/beacon-interface/src/main/java/com/example/beacon/interfac/domain/repository/PulsesRepositoryImpl.java b/beacon-interface/src/main/java/com/example/beacon/interfac/domain/repository/PulsesRepositoryImpl.java
index 2e52168..55bf8e9 100644
--- a/beacon-interface/src/main/java/com/example/beacon/interfac/domain/repository/PulsesRepositoryImpl.java
+++ b/beacon-interface/src/main/java/com/example/beacon/interfac/domain/repository/PulsesRepositoryImpl.java
@@ -36,7 +36,7 @@ public PulseEntity last(Long chainIndex){
     @Transactional(readOnly = true)
     public PulseEntity first(Long chainIndex){
         Long firstPulseIndex = (Long) manager.createQuery(
-                "select min(p.pulseIndex) from PulseEntity p where p.chainIndex = :chainIndex")
+                "select min(p.id) from PulseEntity p where p.chainIndex = :chainIndex")
                 .setParameter("chainIndex", chainIndex)
                 .getSingleResult();