diff --git a/src/main/java/es/uvigo/esei/daa/rest/PetsResource.java b/src/main/java/es/uvigo/esei/daa/rest/PetsResource.java
index 3ddd23e5b6050f0227f75987b9fe8d3f18f156a7..c7f2c278138d15eac06716f4f67e3a96dcd5cf55 100644
--- a/src/main/java/es/uvigo/esei/daa/rest/PetsResource.java
+++ b/src/main/java/es/uvigo/esei/daa/rest/PetsResource.java
@@ -4,10 +4,7 @@ import es.uvigo.esei.daa.dao.DAOException;
 import es.uvigo.esei.daa.dao.PetsDAO;
 import es.uvigo.esei.daa.entities.Pet;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.util.logging.Level;
@@ -63,4 +60,101 @@ public class PetsResource {
                     .build();
         }
     }
+
+
+    @DELETE
+    @Path("/{id}")
+    public Response delete(
+            @PathParam("id") int id
+    ) {
+        try {
+            this.dao.delete(id);
+
+            return Response.ok(id).build();
+        } catch (IllegalArgumentException iae) {
+            LOG.log(Level.FINE, "Invalid pet id in delete method", iae);
+
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(iae.getMessage())
+                    .build();
+        } catch (DAOException e) {
+            LOG.log(Level.SEVERE, "Error deleting a pet", e);
+
+            return Response.serverError()
+                    .entity(e.getMessage())
+                    .build();
+        }
+    }
+
+
+    @GET
+    public Response list() {
+        try {
+            return Response.ok(this.dao.list()).build();
+        } catch (DAOException e) {
+            LOG.log(Level.SEVERE, "Error listing pets", e);
+            return Response.serverError().entity(e.getMessage()).build();
+        }
+    }
+
+
+    @PUT
+    @Path("/{id}")
+    public Response modify(
+            @PathParam("id") int id,
+            @FormParam("name") String name,
+            @FormParam("owner") int owner
+    ) {
+        try {
+            final Pet modifiedPet = new Pet(id, owner, name);
+            this.dao.modify(modifiedPet);
+
+            return Response.ok(modifiedPet).build();
+        } catch (NullPointerException npe) {
+            final String message = String.format("Invalid data for pet (name: %s, owner: %s)", name, owner);
+
+            LOG.log(Level.FINE, message);
+
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(message)
+                    .build();
+        } catch (IllegalArgumentException iae) {
+            LOG.log(Level.FINE, "Invalid pet id in modify method", iae);
+
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(iae.getMessage())
+                    .build();
+        } catch (DAOException e) {
+            LOG.log(Level.SEVERE, "Error modifying a pet", e);
+
+            return Response.serverError()
+                    .entity(e.getMessage())
+                    .build();
+        }
+    }
+
+
+    @POST
+    public Response add(
+            @FormParam("name") String name,
+            @FormParam("owner") int owner
+    ) {
+        try {
+            final Pet newPet = this.dao.add(name, owner);
+
+            return Response.ok(newPet).build();
+        } catch (IllegalArgumentException iae) {
+            LOG.log(Level.FINE, "Invalid pet id in add method", iae);
+
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(iae.getMessage())
+                    .build();
+        } catch (DAOException e) {
+            LOG.log(Level.SEVERE, "Error adding a pet", e);
+
+            return Response.serverError()
+                    .entity(e.getMessage())
+                    .build();
+        }
+    }
 }