diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5553274..6ab89e6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Set up the JDK
       uses: actions/setup-java@v2
       with:
-        java-version: '19'
+        java-version: '22'
         distribution: 'zulu'
         cache: maven
     - name: Test with Maven
diff --git a/pom.xml b/pom.xml
index 6a2f487..d6096fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,8 +7,8 @@
   <version>1.0.1-SNAPSHOT</version>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>19</maven.compiler.source>
-    <maven.compiler.target>19</maven.compiler.target>
+    <maven.compiler.source>22</maven.compiler.source>
+    <maven.compiler.target>22</maven.compiler.target>
 
     <!--
       Make sure you upgrade the ebean-migration dependency as well.
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.3.12</version>
+      <version>1.3.14</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/src/main/java/com/github/sfxd/trust/core/Entity.java b/src/main/java/com/github/sfxd/trust/core/Entity.java
index 5d04296..2038732 100644
--- a/src/main/java/com/github/sfxd/trust/core/Entity.java
+++ b/src/main/java/com/github/sfxd/trust/core/Entity.java
@@ -28,9 +28,8 @@ public Long getId() {
         return this.id;
     }
 
-    public Entity setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
-        return this;
     }
 
     public boolean isNew() {
diff --git a/src/main/java/com/github/sfxd/trust/core/EntityService.java b/src/main/java/com/github/sfxd/trust/core/EntityService.java
deleted file mode 100644
index 391e24c..0000000
--- a/src/main/java/com/github/sfxd/trust/core/EntityService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-package com.github.sfxd.trust.core;
-
-import java.util.Collection;
-import java.util.List;
-
-/** Base class for all of the entity services */
-public abstract class EntityService<T extends Entity> {
-
-    protected EntityService() {
-    }
-
-    protected abstract Repository<T> repository();
-
-    public void insert(Collection<T> entities) {
-        this.repository().insert(entities);
-    }
-
-    public void insert(T entity) {
-        this.insert(List.of(entity));
-    }
-
-    public void update(Collection<T> entities) {
-        this.repository().update(entities);
-    }
-
-    public void update(T entity) {
-        this.update(List.of(entity));
-    }
-
-    public void delete(Collection<T> entities) {
-        this.repository().delete(entities);
-    }
-
-    public void delete(T entity) {
-        this.delete(List.of(entity));
-    }
-}
diff --git a/src/main/java/com/github/sfxd/trust/core/Message.java b/src/main/java/com/github/sfxd/trust/core/Message.java
new file mode 100644
index 0000000..3132cd0
--- /dev/null
+++ b/src/main/java/com/github/sfxd/trust/core/Message.java
@@ -0,0 +1,8 @@
+package com.github.sfxd.trust.core;
+
+import com.github.sfxd.trust.core.users.User;
+
+public interface Message {
+    User to();
+    String body();
+}
diff --git a/src/main/java/com/github/sfxd/trust/core/MessageService.java b/src/main/java/com/github/sfxd/trust/core/MessageService.java
deleted file mode 100644
index 5d4ea55..0000000
--- a/src/main/java/com/github/sfxd/trust/core/MessageService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-package com.github.sfxd.trust.core;
-
-import com.github.sfxd.trust.core.users.User;
-
-public interface MessageService {
-    void sendMessage(User user, String message);
-}
diff --git a/src/main/java/com/github/sfxd/trust/core/Messages.java b/src/main/java/com/github/sfxd/trust/core/Messages.java
new file mode 100644
index 0000000..604958a
--- /dev/null
+++ b/src/main/java/com/github/sfxd/trust/core/Messages.java
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+package com.github.sfxd.trust.core;
+
+public interface Messages {
+    void send(Message message);
+}
diff --git a/src/main/java/com/github/sfxd/trust/core/Repository.java b/src/main/java/com/github/sfxd/trust/core/Repository.java
index dcb15c4..694afdb 100644
--- a/src/main/java/com/github/sfxd/trust/core/Repository.java
+++ b/src/main/java/com/github/sfxd/trust/core/Repository.java
@@ -2,13 +2,11 @@
 package com.github.sfxd.trust.core;
 
 import java.util.Collection;
-import java.util.Optional;
 
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.Query;
 
-/** The base of all finders */
 public abstract class Repository<T extends Entity> {
 
     protected final Class<T> clazz;
@@ -19,16 +17,11 @@ protected Repository(Class<T> clazz) {
         this.database = DB.getDefault();
     }
 
-    /**
-     * Finds an entity by its id
-     * @param id the id of the entity you want to find
-     * @return an optional containing the entity or empty
-     */
-    public Optional<T> findById(Long id) {
+    public T findById(Long id) {
         return this.query()
             .where()
             .idEq(id)
-            .findOneOrEmpty();
+            .findOne();
     }
 
     protected Query<T> query() {
@@ -39,11 +32,31 @@ public void insert(Collection<T> entities) {
         this.database.insertAll(entities);
     }
 
+    public void insert(T entity) {
+        this.database.insert(entity);
+    }
+
     public void update(Collection<T> entities) {
         this.database.updateAll(entities);
     }
 
+    public void update(T entity) {
+        this.database.update(entity);
+    }
+
     public void delete(Collection<T> entities) {
         this.database.deleteAll(entities);
     }
+
+    public void delete(T entity) {
+        this.database.delete(entity);
+    }
+
+    public void save(Collection<T> entities) {
+        this.database.saveAll(entities);
+    }
+
+    public void save(T entity) {
+        this.database.save(entity);
+    }
 }
diff --git a/src/main/java/com/github/sfxd/trust/core/instances/Instance.java b/src/main/java/com/github/sfxd/trust/core/instances/Instance.java
index 32fddd9..08db613 100644
--- a/src/main/java/com/github/sfxd/trust/core/instances/Instance.java
+++ b/src/main/java/com/github/sfxd/trust/core/instances/Instance.java
@@ -12,7 +12,10 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.sfxd.trust.core.Entity;
-import com.github.sfxd.trust.core.instanceusers.InstanceUser;
+import com.github.sfxd.trust.core.subscription.Subscription;
+import org.apache.commons.lang3.builder.DiffBuilder;
+import org.apache.commons.lang3.builder.DiffResult;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * Represents an SFDC instance. Sandbox or Production.
@@ -41,7 +44,7 @@ public class Instance extends Entity {
     private Environment environment;
 
     @OneToMany(mappedBy = "instance", cascade = CascadeType.REMOVE)
-    private List<InstanceUser> instanceUsers;
+    private List<Subscription> subscriptions;
 
     public Instance() {
 
@@ -101,12 +104,12 @@ public Instance setEnvironment(Environment environment) {
         return this;
     }
 
-    public List<InstanceUser> getInstanceUsers() {
-        return this.instanceUsers;
+    public List<Subscription> getSubscriptions() {
+        return this.subscriptions;
     }
 
-    public Instance setInstanceUsers(List<InstanceUser> instanceUsers) {
-        this.instanceUsers = instanceUsers;
+    public Instance setSubscriptions(List<Subscription> subscriptions) {
+        this.subscriptions = subscriptions;
         return this;
     }
 
@@ -118,6 +121,16 @@ public enum Environment {
         PRODUCTION
     }
 
+    public DiffResult<Instance> diff(Instance other) {
+        return new DiffBuilder<>(other, this, ToStringStyle.DEFAULT_STYLE, false)
+            .append("status", other.status, this.status)
+            .append("environment", other.environment, this.environment)
+            .append("location", other.location, this.location)
+            .append("releaseNumber", other.releaseNumber, this.releaseNumber)
+            .append("releaseVersion", other.releaseVersion, this.releaseVersion)
+            .build();
+    }
+
     @Override
     public boolean equals(Object other) {
         if (other instanceof Instance i) {
diff --git a/src/main/java/com/github/sfxd/trust/core/instances/InstanceFinder.java b/src/main/java/com/github/sfxd/trust/core/instances/InstanceRepository.java
similarity index 64%
rename from src/main/java/com/github/sfxd/trust/core/instances/InstanceFinder.java
rename to src/main/java/com/github/sfxd/trust/core/instances/InstanceRepository.java
index 050301b..9b90aed 100644
--- a/src/main/java/com/github/sfxd/trust/core/instances/InstanceFinder.java
+++ b/src/main/java/com/github/sfxd/trust/core/instances/InstanceRepository.java
@@ -2,8 +2,8 @@
 package com.github.sfxd.trust.core.instances;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Optional;
-import java.util.stream.Stream;
 
 import javax.inject.Singleton;
 
@@ -11,10 +11,10 @@
 
 /** Finder for the Instance model */
 @Singleton
-class InstanceFinder extends Repository<Instance> {
+public class InstanceRepository extends Repository<Instance> {
     private static final String KEY = "key";
 
-    InstanceFinder() {
+    InstanceRepository() {
         super(Instance.class);
     }
 
@@ -24,11 +24,11 @@ class InstanceFinder extends Repository<Instance> {
      * @param key the instance's unique key you want to find
      * @return the matching instances
      */
-    public Optional<Instance> findByKey(String key) {
+    public Instance findByKey(String key) {
         return this.query()
             .where()
             .eq(KEY, key)
-            .findOneOrEmpty();
+            .findOne();
     }
 
     /**
@@ -37,12 +37,14 @@ public Optional<Instance> findByKey(String key) {
      * @param keys the keys you want to filter by
      * @return the matching instances
      */
-    public Stream<Instance> findByKeyIn(Collection<String> keys) {
-        return this.query()
+    public Collection<Instance> findByKeyIn(Collection<String> keys) {
+        var query = this.query()
+            .fetch("instanceUsers")
             .where()
             .in(KEY, keys)
-            .query()
-            .findStream();
+            .query();
+
+        return Collections.unmodifiableList(query.findList());
     }
 
     /**
@@ -51,11 +53,12 @@ public Stream<Instance> findByKeyIn(Collection<String> keys) {
      * @param ids the ids you want to filter by
      * @return the matching instances
      */
-    public Stream<Instance> findByIdIn(Collection<Long> ids) {
-        return this.query()
+    public Collection<Instance> findByIdIn(Collection<Long> ids) {
+        var query = this.query()
             .where()
             .idIn(ids)
-            .query()
-            .findStream();
+            .query();
+
+        return Collections.unmodifiableList(query.findList());
     }
 }
diff --git a/src/main/java/com/github/sfxd/trust/core/instances/InstanceService.java b/src/main/java/com/github/sfxd/trust/core/instances/InstanceService.java
deleted file mode 100644
index e7cd7d0..0000000
--- a/src/main/java/com/github/sfxd/trust/core/instances/InstanceService.java
+++ /dev/null
@@ -1,105 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-package com.github.sfxd.trust.core.instances;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Map.Entry;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import com.github.sfxd.trust.core.EntityService;
-import com.github.sfxd.trust.core.MessageService;
-import com.github.sfxd.trust.core.Repository;
-import com.github.sfxd.trust.core.instanceusers.InstanceUser;
-import com.github.sfxd.trust.core.instanceusers.InstanceUserService;
-import com.github.sfxd.trust.core.users.User;
-
-import org.apache.commons.lang3.builder.Diff;
-import org.apache.commons.lang3.builder.DiffBuilder;
-import org.apache.commons.lang3.builder.DiffResult;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import io.ebean.annotation.Transactional;
-
-/**
- * Service for working with the {@link Instance} model.
- */
-@Singleton
-public class InstanceService extends EntityService<Instance> {
-
-    private final InstanceUserService instanceUserService;
-    private final InstanceFinder instanceFinder;
-    private final MessageService messageService;
-
-    @Inject
-    public InstanceService(
-        MessageService messageService,
-        InstanceUserService instanceUserService,
-        InstanceFinder instanceFinder
-    ) {
-        this.messageService = messageService;
-        this.instanceUserService = instanceUserService;
-        this.instanceFinder = instanceFinder;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    @Transactional
-    public void update(Collection<Instance> entities) {
-        Map<Long, Instance> instancesById = entities.stream()
-            .collect(Collectors.toMap(Instance::getId, Function.identity()));
-
-        Map<Long, DiffResult<Instance>> changes = this.instanceFinder.findByIdIn(instancesById.keySet())
-            .map(old -> diff(old, instancesById.get(old.getId())))
-            .filter(diff -> !diff.getDiffs().isEmpty())
-            .collect(Collectors.toMap(diff -> diff.getLeft().getId(), Function.identity()));
-
-        Map<User, List<InstanceUser>> subscriptions = this.instanceUserService
-            .findByInstanceIdIn(changes.keySet())
-            .collect(Collectors.groupingBy(InstanceUser::getUser));
-
-        for (Entry<User, List<InstanceUser>> entry : subscriptions.entrySet()) {
-            var message = new StringBuilder();
-            for (InstanceUser is : entry.getValue()) {
-                Instance instance = is.getInstance();
-                message.append(instance.getKey());
-                message.append(System.lineSeparator());
-
-                DiffResult<Instance> diff = changes.get(instance.getId());
-                for (Diff<?> d : diff) {
-                    message.append(String.format("  %s: %s -> %s%n", d.getFieldName(), d.getLeft(), d.getRight()));
-                }
-            }
-
-            this.messageService.sendMessage(entry.getKey(), message.toString());
-        }
-    }
-
-    private static DiffResult<Instance> diff(Instance old, Instance current) {
-        return new DiffBuilder<>(old, current, ToStringStyle.DEFAULT_STYLE, false)
-            .append("status", old.getStatus(), current.getStatus())
-            .append("environment", old.getEnvironment(), current.getEnvironment())
-            .append("location", old.getLocation(), current.getLocation())
-            .append("releaseNumber", old.getReleaseNumber(), current.getReleaseNumber())
-            .append("releaseVersion", old.getReleaseVersion(), current.getReleaseVersion())
-            .build();
-    }
-
-    public Optional<Instance> findByKey(String key) {
-        return this.instanceFinder.findByKey(key);
-    }
-
-    public Stream<Instance> findByKeyIn(Collection<String> keys) {
-        return this.instanceFinder.findByKeyIn(keys);
-    }
-
-    protected Repository<Instance> repository() {
-        return this.instanceFinder;
-    }
-}
diff --git a/src/main/java/com/github/sfxd/trust/core/instances/InstanceUpdatedMessage.java b/src/main/java/com/github/sfxd/trust/core/instances/InstanceUpdatedMessage.java
new file mode 100644
index 0000000..113a134
--- /dev/null
+++ b/src/main/java/com/github/sfxd/trust/core/instances/InstanceUpdatedMessage.java
@@ -0,0 +1,32 @@
+package com.github.sfxd.trust.core.instances;
+
+import com.github.sfxd.trust.core.Message;
+import com.github.sfxd.trust.core.subscription.Subscription;
+import com.github.sfxd.trust.core.users.User;
+import org.apache.commons.lang3.builder.Diff;
+import org.apache.commons.lang3.builder.DiffResult;
+
+public class InstanceUpdatedMessage implements Message {
+    private final Subscription subscription;
+    private final DiffResult<Instance> diff;
+
+    public InstanceUpdatedMessage(Subscription subscription, DiffResult<Instance> diff) {
+        this.subscription = subscription;
+        this.diff = diff;
+    }
+
+    @Override
+    public User to() {
+        return this.subscription.getUser();
+    }
+
+    @Override
+    public String body() {
+        var body = new StringBuilder();
+        for (Diff<?> d : diff) {
+            body.append("  %s: %s -> %s%n".formatted(d.getFieldName(), d.getLeft(), d.getRight()));
+        }
+
+        return body.toString();
+    }
+}
diff --git a/src/main/java/com/github/sfxd/trust/core/instanceusers/InstanceUserRepository.java b/src/main/java/com/github/sfxd/trust/core/instanceusers/InstanceUserRepository.java
deleted file mode 100644
index b5d5869..0000000
--- a/src/main/java/com/github/sfxd/trust/core/instanceusers/InstanceUserRepository.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-package com.github.sfxd.trust.core.instanceusers;
-
-import java.util.Collection;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import javax.inject.Singleton;
-
-import com.github.sfxd.trust.core.Repository;
-
-/** Finder for the InstanceUser model */
-@Singleton
-class InstanceUserRepository extends Repository<InstanceUser> {
-
-    InstanceUserRepository() {
-        super(InstanceUser.class);
-    }
-
-    /**
-     * Finds a subscription by it's instances key and the the user's username
-     *
-     * @param key      the instance's key (e.g. NA99)
-     * @param username discord user id
-     * @return the query matching the subscriber
-     */
-    public Optional<InstanceUser> findByKeyAndUsername(String key, String username) {
-        return this.query()
-            .where()
-            .eq("user.username", username)
-            .and()
-            .eq("instance.key", key)
-            .findOneOrEmpty();
-    }
-
-    /**
-     * Finds a subscription by its insance id and user's id
-     *
-     * @param instanceId   the id of the instance
-     * @param userId the is of the subscriber
-     * @return the query of matching subscribers
-     */
-    public Optional<InstanceUser> findByInstanceIdAndUserId(Long instanceId, Long userId) {
-        return this.query()
-            .where()
-            .eq("user.id", userId)
-            .and()
-            .eq("instance.id", instanceId)
-            .findOneOrEmpty();
-    }
-
-    /**
-     * Finds all subscribers who's instance is in the provided instance ids
-     *
-     * @param instanceIds the instances you want to filter by
-     * @return the matching subscribers
-     */
-    public Stream<InstanceUser> findByInstanceIdIn(Collection<Long> instanceIds) {
-        return this.query()
-            .where()
-            .in("instance.id", instanceIds)
-            .query()
-            .findStream();
-    }
-}
diff --git a/src/main/java/com/github/sfxd/trust/core/instanceusers/InstanceUserService.java b/src/main/java/com/github/sfxd/trust/core/instanceusers/InstanceUserService.java
deleted file mode 100644
index fc27e8d..0000000
--- a/src/main/java/com/github/sfxd/trust/core/instanceusers/InstanceUserService.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-package com.github.sfxd.trust.core.instanceusers;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import com.github.sfxd.trust.core.Entity;
-import com.github.sfxd.trust.core.EntityService;
-import com.github.sfxd.trust.core.Repository;
-import com.github.sfxd.trust.core.users.User;
-import com.github.sfxd.trust.core.users.UserService;
-
-import io.ebean.annotation.Transactional;
-
-/**
- * Service for working with the {@link InstanceUser} model
- */
-@Singleton
-public class InstanceUserService extends EntityService<InstanceUser> {
-
-    private final InstanceUserRepository instanceUserRepository;
-    private final UserService userService;
-
-    @Inject
-    public InstanceUserService(InstanceUserRepository repository, UserService userService) {
-        this.instanceUserRepository = repository;
-        this.userService = userService;
-    }
-
-    /**
-     * Insert new InstanceUsers. The user objects can be new users and those will
-     * be persisted as well.
-     */
-    @Override
-    @Transactional
-    public void insert(Collection<InstanceUser> instanceUsers) {
-        List<User> newUsers = instanceUsers.stream()
-            .map(InstanceUser::getUser)
-            .filter(Entity::isNew)
-            .toList();
-
-        this.userService.insert(newUsers);
-    }
-
-    public Optional<InstanceUser> findByInstanceIdAndUserId(Long instanceId, Long userId) {
-        return this.instanceUserRepository.findByInstanceIdAndUserId(instanceId, userId);
-    }
-
-    public Stream<InstanceUser> findByInstanceIdIn(Collection<Long> instanceIds) {
-        return this.instanceUserRepository.findByInstanceIdIn(instanceIds);
-    }
-
-    public Optional<InstanceUser> findByKeyAndUsername(String key, String username) {
-        return this.instanceUserRepository.findByKeyAndUsername(key, username);
-    }
-
-    protected Repository<InstanceUser> repository() {
-        return this.instanceUserRepository;
-    }
-}
diff --git a/src/main/java/com/github/sfxd/trust/core/instanceusers/InstanceUser.java b/src/main/java/com/github/sfxd/trust/core/subscription/Subscription.java
similarity index 71%
rename from src/main/java/com/github/sfxd/trust/core/instanceusers/InstanceUser.java
rename to src/main/java/com/github/sfxd/trust/core/subscription/Subscription.java
index 267c140..b197045 100644
--- a/src/main/java/com/github/sfxd/trust/core/instanceusers/InstanceUser.java
+++ b/src/main/java/com/github/sfxd/trust/core/subscription/Subscription.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-package com.github.sfxd.trust.core.instanceusers;
+package com.github.sfxd.trust.core.subscription;
 
 import java.util.Objects;
 
@@ -15,7 +15,7 @@
  * A junction between instances and their subscribers.
  */
 @javax.persistence.Entity
-public class InstanceUser extends Entity {
+public class Subscription extends Entity {
 
     @ManyToOne(fetch = FetchType.EAGER)
     @Column(nullable = false)
@@ -25,7 +25,7 @@ public class InstanceUser extends Entity {
     @Column(nullable = false)
     private User user;
 
-    public InstanceUser(Instance instance, User user) {
+    public Subscription(Instance instance, User user) {
         this.instance = instance;
         this.user = user;
     }
@@ -34,7 +34,7 @@ public Instance getInstance() {
         return this.instance;
     }
 
-    public InstanceUser setInstance(Instance instance) {
+    public Subscription setInstance(Instance instance) {
         this.instance = instance;
         return this;
     }
@@ -43,16 +43,16 @@ public User getUser() {
         return this.user;
     }
 
-    public InstanceUser setUser(User user) {
+    public Subscription setUser(User user) {
         this.user = user;
         return this;
     }
 
     @Override
     public boolean equals(Object other) {
-        if (other instanceof InstanceUser) {
-            var is = (InstanceUser) other;
-            return Objects.equals(is.instance, this.instance) && Objects.equals(is.user, this.user);
+        if (other instanceof Subscription subscription) {
+            return Objects.equals(subscription.instance, this.instance)
+                && Objects.equals(subscription.user, this.user);
         }
 
         return false;
diff --git a/src/main/java/com/github/sfxd/trust/core/subscription/SubscriptionRepository.java b/src/main/java/com/github/sfxd/trust/core/subscription/SubscriptionRepository.java
new file mode 100644
index 0000000..93fb4da
--- /dev/null
+++ b/src/main/java/com/github/sfxd/trust/core/subscription/SubscriptionRepository.java
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+package com.github.sfxd.trust.core.subscription;
+
+import javax.inject.Singleton;
+
+import com.github.sfxd.trust.core.Repository;
+import com.github.sfxd.trust.core.instances.Instance;
+import com.github.sfxd.trust.core.users.User;
+
+@Singleton
+public class SubscriptionRepository extends Repository<Subscription> {
+
+    SubscriptionRepository() {
+        super(Subscription.class);
+    }
+
+    public Subscription findByInstanceAndUser(Instance instance, User user) {
+        return this.query()
+            .where()
+            .eq("user", user)
+            .eq("instance", instance)
+            .findOne();
+    }
+
+    public Subscription findByKeyAndUsername(String key, String username) {
+        return this.query()
+            .where()
+            .eq("user.username", username)
+            .eq("instance.key", key)
+            .findOne();
+    }
+}
diff --git a/src/main/java/com/github/sfxd/trust/core/users/User.java b/src/main/java/com/github/sfxd/trust/core/users/User.java
index 4ff454a..9114526 100644
--- a/src/main/java/com/github/sfxd/trust/core/users/User.java
+++ b/src/main/java/com/github/sfxd/trust/core/users/User.java
@@ -9,7 +9,7 @@
 import javax.persistence.OneToMany;
 
 import com.github.sfxd.trust.core.Entity;
-import com.github.sfxd.trust.core.instanceusers.InstanceUser;
+import com.github.sfxd.trust.core.subscription.Subscription;
 
 /**
  * Represents a user that has subscribe to notifications
@@ -22,7 +22,7 @@ public class User extends Entity {
     private String username;
 
     @OneToMany(mappedBy = "user", cascade = CascadeType.REMOVE)
-    private List<InstanceUser> instanceUsers;
+    private List<Subscription> subscriptions;
 
     public User(String username) {
         this.username = username;
@@ -37,12 +37,12 @@ public User setUsername(String username) {
         return this;
     }
 
-    public List<InstanceUser> getInstanceUsers() {
-        return this.instanceUsers;
+    public List<Subscription> getInstanceUsers() {
+        return this.subscriptions;
     }
 
-    public User setInstanceUsers(List<InstanceUser> instanceUsers) {
-        this.instanceUsers = instanceUsers;
+    public User setInstanceUsers(List<Subscription> subscriptions) {
+        this.subscriptions = subscriptions;
         return this;
     }
 
diff --git a/src/main/java/com/github/sfxd/trust/core/users/UserFinder.java b/src/main/java/com/github/sfxd/trust/core/users/UserRepository.java
similarity index 75%
rename from src/main/java/com/github/sfxd/trust/core/users/UserFinder.java
rename to src/main/java/com/github/sfxd/trust/core/users/UserRepository.java
index 412d014..f5b7e6e 100644
--- a/src/main/java/com/github/sfxd/trust/core/users/UserFinder.java
+++ b/src/main/java/com/github/sfxd/trust/core/users/UserRepository.java
@@ -1,16 +1,14 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 package com.github.sfxd.trust.core.users;
 
-import java.util.Optional;
-
 import javax.inject.Singleton;
 
 import com.github.sfxd.trust.core.Repository;
 
 @Singleton
-class UserFinder extends Repository<User> {
+public class UserRepository extends Repository<User> {
 
-    UserFinder() {
+    public UserRepository() {
         super(User.class);
     }
 
@@ -21,10 +19,10 @@ class UserFinder extends Repository<User> {
      * @return An Optional containing the subscriber or empty if hibernate throws
      *         NoResultException
      */
-    public Optional<User> findByUsername(String username) {
+    public User findByUsername(String username) {
         return this.query()
             .where()
             .eq("username", username)
-            .findOneOrEmpty();
+            .findOne();
     }
 }
diff --git a/src/main/java/com/github/sfxd/trust/core/users/UserService.java b/src/main/java/com/github/sfxd/trust/core/users/UserService.java
deleted file mode 100644
index 3a6c989..0000000
--- a/src/main/java/com/github/sfxd/trust/core/users/UserService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-package com.github.sfxd.trust.core.users;
-
-import java.util.Optional;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import com.github.sfxd.trust.core.EntityService;
-import com.github.sfxd.trust.core.Repository;
-
-/**
- * Service for interacting with the {@link User} model.
- */
-@Singleton
-public class UserService extends EntityService<User> {
-
-    private final UserFinder repository;
-
-    @Inject
-    public UserService(UserFinder repository) {
-        this.repository = repository;
-    }
-
-    public Optional<User> findByUsername(String username) {
-        return this.repository.findByUsername(username);
-    }
-
-    protected Repository<User> repository() {
-        return this.repository;
-    }
-}
diff --git a/src/main/java/com/github/sfxd/trust/discord/BotCommandFactory.java b/src/main/java/com/github/sfxd/trust/discord/BotCommandFactory.java
index ef0c9b4..a510e3b 100644
--- a/src/main/java/com/github/sfxd/trust/discord/BotCommandFactory.java
+++ b/src/main/java/com/github/sfxd/trust/discord/BotCommandFactory.java
@@ -4,10 +4,9 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
-import com.github.sfxd.trust.core.instances.InstanceService;
-import com.github.sfxd.trust.core.instanceusers.InstanceUserService;
-import com.github.sfxd.trust.core.users.UserService;
-
+import com.github.sfxd.trust.core.instances.InstanceRepository;
+import com.github.sfxd.trust.core.subscription.SubscriptionRepository;
+import com.github.sfxd.trust.core.users.UserRepository;
 import org.apache.commons.lang3.StringUtils;
 
 import net.dv8tion.jda.api.JDA;
@@ -22,39 +21,35 @@ class BotCommandFactory {
     static final String SOURCE = "source";
     static final String INSTANCE = "instance";
 
-    private final InstanceUserService isService;
-    private final UserService subscriberService;
-    private final InstanceService instanceService;
+    private final InstanceRepository instanceRepository;
+    private final UserRepository userRepository;
+    private final SubscriptionRepository subscriptionRepository;
     private final JDA jda;
 
     @Inject
     BotCommandFactory(
-        InstanceUserService isService,
-        UserService subscriberService,
-        InstanceService instanceService,
+        InstanceRepository instanceRepository,
+        UserRepository userRepository,
+        SubscriptionRepository subscriptionRepository,
         JDA jda
     ) {
-        this.isService = isService;
-        this.subscriberService = subscriberService;
-        this.instanceService = instanceService;
+        this.instanceRepository = instanceRepository;
+        this.userRepository = userRepository;
+        this.subscriptionRepository = subscriptionRepository;
         this.jda = jda;
-
         this.jda.upsertCommand(SUBSCRIBE, "subscribe to notifications about a sandbox.")
             .addOptions(
                 new OptionData(OptionType.STRING, INSTANCE, "the sandbox instance you want to subscribe to.")
                     .setRequired(true)
             )
             .queue();
-
         this.jda.upsertCommand(UNSUBSCRIBE, "unsubscribe to notifications about a sandbox.")
             .addOptions(
                 new OptionData(OptionType.STRING, INSTANCE, "the sandbox instance you want to subscribe to.")
                     .setRequired(true)
             )
             .queue();
-
         this.jda.upsertCommand(SOURCE, "get the source code.").queue();
-
         this.jda.upsertCommand("help", "prints usage instructions.").queue();
     }
 
@@ -70,13 +65,13 @@ BotCommand of(SlashCommandEvent event) {
                 if (SUBSCRIBE.equals(command)) {
                     yield new SubscribeBotCommand(
                         event,
-                        this.instanceService,
-                        this.isService,
-                        this.subscriberService,
+                        this.instanceRepository,
+                        this.userRepository,
+                        this.subscriptionRepository,
                         instanceKey
                     );
                 } else {
-                    yield new UnsubscribeBotCommand(event, instanceKey, this.isService);
+                    yield new UnsubscribeBotCommand(event, instanceKey, this.subscriptionRepository);
                 }
             }
             case SOURCE -> new SourceBotCommand(event);
diff --git a/src/main/java/com/github/sfxd/trust/discord/JdaMessageService.java b/src/main/java/com/github/sfxd/trust/discord/JdaMessages.java
similarity index 53%
rename from src/main/java/com/github/sfxd/trust/discord/JdaMessageService.java
rename to src/main/java/com/github/sfxd/trust/discord/JdaMessages.java
index 2f06701..c23a591 100644
--- a/src/main/java/com/github/sfxd/trust/discord/JdaMessageService.java
+++ b/src/main/java/com/github/sfxd/trust/discord/JdaMessages.java
@@ -4,25 +4,25 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
-import com.github.sfxd.trust.core.MessageService;
-import com.github.sfxd.trust.core.users.User;
+import com.github.sfxd.trust.core.Message;
+import com.github.sfxd.trust.core.Messages;
 
 import net.dv8tion.jda.api.JDA;
 
 @ApplicationScoped
-class JdaMessageService implements MessageService {
+class JdaMessages implements Messages {
 
     private final JDA jda;
 
     @Inject
-    JdaMessageService(JDA jda) {
+    JdaMessages(JDA jda) {
         this.jda = jda;
     }
 
     @Override
-    public void sendMessage(User user, String message) {
-        this.jda.retrieveUserById(user.getUsername()).queue(u -> {
-            u.openPrivateChannel().queue(channel -> channel.sendMessage(message).queue());
+    public void send(Message message) {
+        this.jda.retrieveUserById(message.to().getUsername()).queue(u -> {
+            u.openPrivateChannel().queue(channel -> channel.sendMessage(message.body()).queue());
         });
     }
 }
diff --git a/src/main/java/com/github/sfxd/trust/discord/SubscribeBotCommand.java b/src/main/java/com/github/sfxd/trust/discord/SubscribeBotCommand.java
index 3c68b29..55c593f 100644
--- a/src/main/java/com/github/sfxd/trust/discord/SubscribeBotCommand.java
+++ b/src/main/java/com/github/sfxd/trust/discord/SubscribeBotCommand.java
@@ -4,42 +4,41 @@
 import java.util.Optional;
 
 import com.github.sfxd.trust.core.instances.Instance;
-import com.github.sfxd.trust.core.instances.InstanceService;
-import com.github.sfxd.trust.core.instanceusers.InstanceUser;
-import com.github.sfxd.trust.core.instanceusers.InstanceUserService;
-import com.github.sfxd.trust.core.users.UserService;
+import com.github.sfxd.trust.core.instances.InstanceRepository;
+import com.github.sfxd.trust.core.subscription.Subscription;
+import com.github.sfxd.trust.core.subscription.SubscriptionRepository;
 import com.github.sfxd.trust.core.users.User;
 
+import com.github.sfxd.trust.core.users.UserRepository;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 
 
 class SubscribeBotCommand extends BotCommand {
 
-    private final InstanceService instanceService;
-    private final InstanceUserService instanceUserService;
-    private final UserService userService;
+    private final InstanceRepository instanceRepository;
+    private final UserRepository userRepository;
+    private final SubscriptionRepository subscriptionRepository;
     private final String key;
 
     SubscribeBotCommand(
         SlashCommandEvent event,
-        InstanceService instanceService,
-        InstanceUserService isService,
-        UserService subscriberService,
+        InstanceRepository instanceRepository,
+        UserRepository userRepository,
+        SubscriptionRepository subscriptionRepository,
         String key
     ) {
         super(event);
 
-        this.instanceService = instanceService;
-        this.instanceUserService = isService;
-        this.userService = subscriberService;
+        this.instanceRepository = instanceRepository;
+        this.userRepository = userRepository;
+        this.subscriptionRepository = subscriptionRepository;
         this.key = key;
     }
 
     @Override
     public void run() {
-        Optional<Instance> instance = this.instanceService.findByKey(key);
-
-        if (instance.isEmpty()) {
+        Instance instance = this.instanceRepository.findByKey(key);
+        if (instance == null) {
             this.event.reply(String.format("%s is not a valid instance key.", this.key))
                 .queue();
 
@@ -47,20 +46,23 @@ public void run() {
         }
 
         String username = this.event.getUser().getId();
-        User user = this.userService.findByUsername(username)
-            .orElseGet(() -> new User(username));
+        User user = this.findUser(username);
 
-        InstanceUser subscription = null;
+        Subscription subscription = null;
         if (!user.isNew()) {
-            subscription = this.instanceUserService
-                .findByInstanceIdAndUserId(instance.get().getId(), user.getId())
-                .orElse(null);
-        }
-
-        if (subscription == null) {
-            this.instanceUserService.insert(new InstanceUser(instance.get(), user));
+            subscription = this.subscriptionRepository.findByInstanceAndUser(instance, user);
+            if (subscription == null)
+                this.subscriptionRepository.insert(new Subscription(instance, user));
         }
 
         this.replyWithCheckMark();
     }
+
+    private User findUser(String username) {
+        User user = this.userRepository.findByUsername(username);
+        if (user == null)
+            user = new User(username);
+
+        return user;
+    }
 }
diff --git a/src/main/java/com/github/sfxd/trust/discord/UnsubscribeBotCommand.java b/src/main/java/com/github/sfxd/trust/discord/UnsubscribeBotCommand.java
index aabdc59..b690443 100644
--- a/src/main/java/com/github/sfxd/trust/discord/UnsubscribeBotCommand.java
+++ b/src/main/java/com/github/sfxd/trust/discord/UnsubscribeBotCommand.java
@@ -1,37 +1,28 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 package com.github.sfxd.trust.discord;
 
-import java.util.Optional;
-
-import com.github.sfxd.trust.core.instanceusers.InstanceUser;
-import com.github.sfxd.trust.core.instanceusers.InstanceUserService;
+import com.github.sfxd.trust.core.subscription.Subscription;
 
+import com.github.sfxd.trust.core.subscription.SubscriptionRepository;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 
 /** Command for !trust unsubscribe <serverkey> */
 class UnsubscribeBotCommand extends BotCommand {
     private final String key;
-    private final InstanceUserService instanceUserService;
+    private final SubscriptionRepository repository;
 
-    UnsubscribeBotCommand(
-        SlashCommandEvent event,
-        String key,
-        InstanceUserService isService
-    ) {
+    UnsubscribeBotCommand(SlashCommandEvent event, String key, SubscriptionRepository repository) {
         super(event);
 
         this.key = key;
-        this.instanceUserService = isService;
+        this.repository = repository;
     }
 
     @Override
     public void run() {
-        Optional<InstanceUser> subscription = this.instanceUserService
-            .findByKeyAndUsername(this.key, this.event.getUser().getId());
-
-        if (subscription.isPresent()) {
-            this.instanceUserService.delete(subscription.get());
-        }
+        Subscription subscription = this.repository.findByKeyAndUsername(this.key, this.event.getUser().getId());
+        if (subscription != null)
+            this.repository.delete(subscription);
 
         this.replyWithCheckMark();
     }
diff --git a/src/main/java/com/github/sfxd/trust/discord/cdi/JDAProducer.java b/src/main/java/com/github/sfxd/trust/discord/cdi/JDAProducer.java
index 4c024f5..17d49c3 100644
--- a/src/main/java/com/github/sfxd/trust/discord/cdi/JDAProducer.java
+++ b/src/main/java/com/github/sfxd/trust/discord/cdi/JDAProducer.java
@@ -30,7 +30,6 @@ JDA produceJDA(
         MessageListener listener
     ) throws Exception {
         return JDABuilder.createDefault(token)
-            .setActivity(Activity.playing("In Vip we trust."))
             .addEventListeners(listener)
             .build();
     }
diff --git a/src/main/java/com/github/sfxd/trust/discord/package-info.java b/src/main/java/com/github/sfxd/trust/discord/package-info.java
deleted file mode 100644
index bd3d6fd..0000000
--- a/src/main/java/com/github/sfxd/trust/discord/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-/** JDA event listeners */
-package com.github.sfxd.trust.discord;
diff --git a/src/main/java/com/github/sfxd/trust/integrations/InstanceRefreshConsumer.java b/src/main/java/com/github/sfxd/trust/integrations/InstanceRefreshConsumer.java
index d2db58f..ff7bab5 100644
--- a/src/main/java/com/github/sfxd/trust/integrations/InstanceRefreshConsumer.java
+++ b/src/main/java/com/github/sfxd/trust/integrations/InstanceRefreshConsumer.java
@@ -1,56 +1,67 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 package com.github.sfxd.trust.integrations;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
+import com.github.sfxd.trust.core.Messages;
 import com.github.sfxd.trust.core.instances.Instance;
-import com.github.sfxd.trust.core.instances.InstanceService;
+import com.github.sfxd.trust.core.instances.InstanceRepository;
+import com.github.sfxd.trust.core.instances.InstanceUpdatedMessage;
+import com.github.sfxd.trust.core.subscription.Subscription;
+import org.apache.commons.lang3.builder.DiffResult;
+
+import static java.util.function.Function.identity;
 
 @ApplicationScoped
 class InstanceRefreshConsumer implements Consumer<Collection<Instance>> {
 
-    private final InstanceService instanceService;
+    private final InstanceRepository instanceRepository;
+    private final Messages messages;
 
     @Inject
-    InstanceRefreshConsumer(InstanceService instanceService) {
-        this.instanceService = instanceService;
+    InstanceRefreshConsumer(InstanceRepository instanceRepository, Messages messages) {
+        this.instanceRepository = instanceRepository;
+        this.messages = messages;
     }
 
     @Override
     public void accept(Collection<Instance> incomingInstances) {
         Map<String, Instance> instancePreviews = incomingInstances.stream()
-            .collect(Collectors.toMap(Instance::getKey, Function.identity()));
+            .collect(Collectors.toMap(Instance::getKey, identity()));
 
-        Map<String, Instance> instances = this.instanceService.findByKeyIn(instancePreviews.keySet())
-            .collect(Collectors.toMap(Instance::getKey, Function.identity()));
+        Map<String, Instance> instances = this.instanceRepository.findByKeyIn(instancePreviews.keySet())
+            .stream()
+            .collect(Collectors.toMap(Instance::getKey, identity()));
 
-        var forUpdate = new ArrayList<Instance>();
-        var forInsert = new ArrayList<Instance>();
         for (Instance preview : instancePreviews.values()) {
-            Instance current = instances.get(preview.getKey());
-            if (current != null) {
-                current
-                    .setLocation(preview.getLocation())
-                    .setReleaseVersion(preview.getReleaseVersion())
-                    .setReleaseNumber(preview.getReleaseNumber())
-                    .setStatus(preview.getStatus())
-                    .setEnvironment(preview.getEnvironment());
-
-                forUpdate.add(current);
-            } else {
-                forInsert.add(preview);
-            }
+            Instance current = instances.computeIfAbsent(preview.getKey(), key -> preview);
+            DiffResult<Instance> diff = current.diff(preview);
+            if (!diff.getDiffs().isEmpty())
+                this.update(current, preview, diff);
         }
 
-        this.instanceService.update(forUpdate);
-        this.instanceService.insert(forInsert);
+        this.instanceRepository.save(instances.values());
+    }
+
+    private void update(Instance current, Instance preview, DiffResult<Instance> diff) {
+        current
+            .setLocation(preview.getLocation())
+            .setReleaseVersion(preview.getReleaseVersion())
+            .setReleaseNumber(preview.getReleaseNumber())
+            .setStatus(preview.getStatus())
+            .setEnvironment(preview.getEnvironment());
+        this.sendMessages(current, diff);
+    }
+
+    private void sendMessages(Instance current, DiffResult<Instance> diff) {
+        for (Subscription subscription : current.getSubscriptions()) {
+            this.messages.send(new InstanceUpdatedMessage(subscription, diff));
+        }
     }
 }
diff --git a/src/main/java/com/github/sfxd/trust/integrations/InstanceRefreshRoute.java b/src/main/java/com/github/sfxd/trust/integrations/InstanceRefreshRoute.java
index b698f5d..39f7a8c 100644
--- a/src/main/java/com/github/sfxd/trust/integrations/InstanceRefreshRoute.java
+++ b/src/main/java/com/github/sfxd/trust/integrations/InstanceRefreshRoute.java
@@ -16,6 +16,7 @@
  * Task that will check the Trust api instances and update their data in the
  * database.
  */
+@SuppressWarnings("unused") // reflectively found by DI
 public class InstanceRefreshRoute extends RouteBuilder {
     private final InstanceRefreshConsumer consumer;
 
@@ -32,7 +33,7 @@ public void configure() throws Exception {
             .choice()
                 .when(header("CamelHttpResponseCode").isEqualTo(200))
                     .log(LoggingLevel.INFO, "Running instance refresh route")
-                    .unmarshal(new ListJacksonDataFormat(Json.MAPPER, Instance.class))
+                    .unmarshal(new ListJacksonDataFormat(Json.mapper(), Instance.class))
                     .process().body(Collection.class, this.consumer::accept)
                 .endChoice()
                 .otherwise()
diff --git a/src/main/java/com/github/sfxd/trust/integrations/package-info.java b/src/main/java/com/github/sfxd/trust/integrations/package-info.java
deleted file mode 100644
index 0fed6a2..0000000
--- a/src/main/java/com/github/sfxd/trust/integrations/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-/** Integrations into other systems  */
-package com.github.sfxd.trust.integrations;
diff --git a/src/main/java/com/github/sfxd/trust/util/Json.java b/src/main/java/com/github/sfxd/trust/util/Json.java
index 5dcfebb..6dea1ca 100644
--- a/src/main/java/com/github/sfxd/trust/util/Json.java
+++ b/src/main/java/com/github/sfxd/trust/util/Json.java
@@ -9,8 +9,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class Json {
-
-    public static final ObjectMapper MAPPER = new ObjectMapper()
+    private static final ObjectMapper MAPPER = new ObjectMapper()
         .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
         .disable(DeserializationFeature.FAIL_ON_IGNORED_PROPERTIES);
 
@@ -25,4 +24,8 @@ public static <T> T deserialize(InputStream in, Class<T> clazz) {
             throw new UncheckedIOException(ex);
         }
     }
+
+    public static ObjectMapper mapper() {
+        return MAPPER;
+    }
 }
diff --git a/src/test/java/com/github/sfxd/trust/core/instances/InstanceFinderTests.java b/src/test/java/com/github/sfxd/trust/core/instances/InstanceRepositoryTests.java
similarity index 52%
rename from src/test/java/com/github/sfxd/trust/core/instances/InstanceFinderTests.java
rename to src/test/java/com/github/sfxd/trust/core/instances/InstanceRepositoryTests.java
index b9ee3ca..ae37807 100644
--- a/src/test/java/com/github/sfxd/trust/core/instances/InstanceFinderTests.java
+++ b/src/test/java/com/github/sfxd/trust/core/instances/InstanceRepositoryTests.java
@@ -1,12 +1,9 @@
 package com.github.sfxd.trust.core.instances;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 
 import org.junit.jupiter.api.Test;
@@ -14,9 +11,9 @@
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 
 @TestInstance(Lifecycle.PER_CLASS)
-class InstanceFinderTests {
+class InstanceRepositoryTests {
 
-    private InstanceFinder instanceFinder = new InstanceFinder();
+    private final InstanceRepository instanceRepository = new InstanceRepository();
 
     @Test
     void it_should_find_instances_whos_key_is_in_the_set() {
@@ -25,8 +22,10 @@ void it_should_find_instances_whos_key_is_in_the_set() {
         a.setKey("NA01");
         b.setKey("CS01");
 
-        this.instanceFinder.insert(List.of(a, b));
-        List<Instance> found = this.instanceFinder.findByKeyIn(Set.of(a.getKey())).collect(Collectors.toList());
+        this.instanceRepository.insert(List.of(a, b));
+        List<Instance> found = this.instanceRepository.findByKeyIn(Set.of(a.getKey()))
+            .stream()
+            .toList();
 
         assertEquals(1, found.size());
         assertEquals(found.get(0).getKey(), a.getKey());
@@ -39,8 +38,10 @@ void it_should_find_instances_whos_id_is_in_the_set() {
         a.setKey("NA02");
         b.setKey("CS02");
 
-        this.instanceFinder.insert(List.of(a, b));
-        List<Instance> found = this.instanceFinder.findByIdIn(Set.of(a.getId())).collect(Collectors.toList());
+        this.instanceRepository.insert(List.of(a, b));
+        List<Instance> found = this.instanceRepository.findByIdIn(Set.of(a.getId()))
+            .stream()
+            .toList();
 
         assertEquals(1, found.size());
         assertEquals(found.get(0).getId(), a.getId());
@@ -53,22 +54,9 @@ void it_should_find_the_instance_which_the_matching_key() {
         a.setKey("NA03");
         b.setKey("CS03");
 
-        this.instanceFinder.insert(List.of(a, b));
+        this.instanceRepository.insert(List.of(a, b));
 
-        Instance found = this.instanceFinder.findByKey(a.getKey()).get();
+        Instance found = this.instanceRepository.findByKey(a.getKey());
         assertEquals(found.getKey(), a.getKey());
     }
-
-    @Test
-    void it_should_return_an_empty_optional_when_no_result_is_found_by_key() {
-        var a = new Instance();
-        var b = new Instance();
-        a.setKey("NA04");
-        b.setKey("CS04");
-
-        this.instanceFinder.insert(List.of(a, b));
-
-        Optional<Instance> found = this.instanceFinder.findByKey("ZZ00");
-        assertTrue(found.isEmpty());
-    }
 }
diff --git a/src/test/java/com/github/sfxd/trust/core/instances/InstanceServiceTests.java b/src/test/java/com/github/sfxd/trust/core/instances/InstanceServiceTests.java
deleted file mode 100644
index 3eba9c1..0000000
--- a/src/test/java/com/github/sfxd/trust/core/instances/InstanceServiceTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.github.sfxd.trust.core.instances;
-
-import static org.mockito.ArgumentMatchers.anySet;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.List;
-import java.util.stream.Stream;
-
-import com.github.sfxd.trust.core.MessageService;
-import com.github.sfxd.trust.core.instanceusers.InstanceUser;
-import com.github.sfxd.trust.core.instanceusers.InstanceUserService;
-import com.github.sfxd.trust.core.users.User;
-
-import org.junit.jupiter.api.Test;
-
-class InstanceServiceTests {
-
-    @Test
-    void on_update_it_should_send_a_message_to_all_subscribers_if_the_instance_is_not_ok() throws Exception {
-        var messageService = mock(MessageService.class);
-        var instanceSubscriberService = mock(InstanceUserService.class);
-        var instanceFinder = mock(InstanceFinder.class);
-
-        var instance = new Instance();
-        instance.setKey("NA99");
-        instance.setId(1L);
-        instance.setStatus("NOT_OK");
-        List<Instance> instances = List.of(instance);
-
-        var oldInstance = new Instance();
-        oldInstance.setKey("NA99");
-        oldInstance.setId(1L);
-        oldInstance.setStatus(Instance.STATUS_OK);
-
-        var subscriber = new User("vips#7L");
-        var instanceSubscribers = List.of(new InstanceUser(oldInstance, subscriber));
-
-        when(instanceFinder.findByIdIn(anySet())).thenReturn(Stream.of(oldInstance));
-        when(instanceSubscriberService.findByInstanceIdIn(anySet()))
-            .thenReturn(instanceSubscribers.stream());
-
-        var service = new InstanceService(messageService, instanceSubscriberService, instanceFinder);
-        service.update(instances);
-
-        verify(messageService).sendMessage(eq(subscriber), anyString());
-    }
-}
diff --git a/src/test/java/com/github/sfxd/trust/core/instanceusers/InstanceUserServiceTests.java b/src/test/java/com/github/sfxd/trust/core/instanceusers/InstanceUserServiceTests.java
deleted file mode 100644
index ad31083..0000000
--- a/src/test/java/com/github/sfxd/trust/core/instanceusers/InstanceUserServiceTests.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.github.sfxd.trust.core.instanceusers;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import java.util.List;
-
-import com.github.sfxd.trust.core.instances.Instance;
-import com.github.sfxd.trust.core.users.User;
-import com.github.sfxd.trust.core.users.UserService;
-
-import org.junit.jupiter.api.Test;
-
-class InstanceUserServiceTests {
-
-    @Test
-    void it_should_insert_new_users() {
-        var userService = mock(UserService.class);
-        var iuRepo = mock(InstanceUserRepository.class);
-        var isService = new InstanceUserService(iuRepo, userService);
-        var user = new User("");
-        var instance = new Instance();
-        instance.setId(1L);
-        var instanceUser = new InstanceUser(instance, user);
-
-        isService.insert(instanceUser);
-
-        verify(userService).insert(List.of(user));
-    }
-}
diff --git a/src/test/java/com/github/sfxd/trust/core/instanceusers/InstanceSubscriberFinderTests.java b/src/test/java/com/github/sfxd/trust/core/subscription/SubscriptionRepositoryTests.java
similarity index 59%
rename from src/test/java/com/github/sfxd/trust/core/instanceusers/InstanceSubscriberFinderTests.java
rename to src/test/java/com/github/sfxd/trust/core/subscription/SubscriptionRepositoryTests.java
index 6c41a26..54d9b0e 100644
--- a/src/test/java/com/github/sfxd/trust/core/instanceusers/InstanceSubscriberFinderTests.java
+++ b/src/test/java/com/github/sfxd/trust/core/subscription/SubscriptionRepositoryTests.java
@@ -1,11 +1,9 @@
-package com.github.sfxd.trust.core.instanceusers;
+package com.github.sfxd.trust.core.subscription;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 import com.github.sfxd.trust.core.instances.Instance;
 import com.github.sfxd.trust.core.users.User;
@@ -18,9 +16,9 @@
 import io.ebean.Database;
 
 @TestInstance(Lifecycle.PER_CLASS)
-class InstanceSubscriberFinderTests {
+class SubscriptionRepositoryTests {
 
-    private final InstanceUserRepository finder = new InstanceUserRepository();
+    private final SubscriptionRepository finder = new SubscriptionRepository();
     private final Database db = DB.getDefault();
 
     @Test
@@ -31,9 +29,9 @@ void it_should_find_subscribers_by_the_key_and_username() throws Exception {
         var subscriber = new User("vips#7L");
         this.db.save(subscriber);
 
-        this.finder.insert(List.of(new InstanceUser(instance, subscriber)));
+        this.finder.insert(List.of(new Subscription(instance, subscriber)));
 
-        var found = this.finder.findByKeyAndUsername(instance.getKey(), subscriber.getUsername()).get();
+        var found = this.finder.findByKeyAndUsername(instance.getKey(), subscriber.getUsername());
         assertNotNull(found);
         assertEquals(found.getInstance().getKey(), instance.getKey());
         assertEquals(found.getUser().getUsername(), subscriber.getUsername());
@@ -50,9 +48,9 @@ void it_should_find_subscriptions_by_their_instance_id_and_subscriber_id() throw
         var subscriber = new User("vips#7L");
         this.db.save(subscriber);
 
-        this.finder.insert(List.of(new InstanceUser(instance, subscriber)));
+        this.finder.insert(List.of(new Subscription(instance, subscriber)));
 
-        var found = this.finder.findByInstanceIdAndUserId(instance.getId(), subscriber.getId()).get();
+        var found = this.finder.findByInstanceAndUser(instance, subscriber);
         assertNotNull(found);
         assertEquals(instance.getId(), found.getInstance().getId());
         assertEquals(subscriber.getId(), found.getUser().getId());
@@ -60,22 +58,4 @@ void it_should_find_subscriptions_by_their_instance_id_and_subscriber_id() throw
         this.db.delete(instance);
         this.db.delete(subscriber);
     }
-
-    @Test
-    void it_should_find_subscriptions_with_the_given_instances() throws Exception {
-        var instance = new Instance().setKey("NA99");
-        this.db.save(instance);
-
-        var subscriber = new User("vips#7L");
-        this.db.save(subscriber);
-
-        this.finder.insert(List.of(new InstanceUser(instance, subscriber)));
-
-        var found = this.finder.findByInstanceIdIn(Set.of(instance.getId())).collect(Collectors.toList());
-        assertEquals(1, found.size());
-        assertEquals(instance.getId(), found.get(0).getInstance().getId());
-
-        this.db.delete(instance);
-        this.db.delete(subscriber);
-    }
 }
diff --git a/src/test/java/com/github/sfxd/trust/core/users/UserFinderTests.java b/src/test/java/com/github/sfxd/trust/core/users/UserFinderTests.java
deleted file mode 100644
index 16a2a23..0000000
--- a/src/test/java/com/github/sfxd/trust/core/users/UserFinderTests.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.github.sfxd.trust.core.users;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.util.List;
-import java.util.Optional;
-
-import org.junit.jupiter.api.Test;
-
-class UserFinderTests {
-
-    @Test
-    void it_should_find_users_with_the_specified_username() throws Exception {
-        var finder = new UserFinder();
-
-        var subscriber = new User("vips#7L");
-        finder.insert(List.of(subscriber));
-
-        Optional<User> found = finder.findByUsername(subscriber.getUsername());
-
-        assertTrue(found.isPresent());
-        assertEquals(found.get(), subscriber);
-        assertEquals(found.get().getUsername(), subscriber.getUsername());
-
-        finder.delete(List.of(found.get()));
-    }
-}
diff --git a/src/test/java/com/github/sfxd/trust/core/users/UserRepositoryTests.java b/src/test/java/com/github/sfxd/trust/core/users/UserRepositoryTests.java
new file mode 100644
index 0000000..6b29b31
--- /dev/null
+++ b/src/test/java/com/github/sfxd/trust/core/users/UserRepositoryTests.java
@@ -0,0 +1,27 @@
+package com.github.sfxd.trust.core.users;
+
+import static io.smallrye.common.constraint.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+class UserRepositoryTests {
+
+    @Test
+    void it_should_find_users_with_the_specified_username() throws Exception {
+        var finder = new UserRepository();
+
+        var subscriber = new User("vips#7L");
+        finder.insert(List.of(subscriber));
+
+        User found = finder.findByUsername(subscriber.getUsername());
+
+        assertNotNull(found);
+        assertEquals(found, subscriber);
+        assertEquals(found.getUsername(), subscriber.getUsername());
+
+        finder.delete(List.of(found));
+    }
+}
diff --git a/src/test/java/com/github/sfxd/trust/discord/BotCommandFactoryTests.java b/src/test/java/com/github/sfxd/trust/discord/BotCommandFactoryTests.java
index 6f241f7..bfca21a 100644
--- a/src/test/java/com/github/sfxd/trust/discord/BotCommandFactoryTests.java
+++ b/src/test/java/com/github/sfxd/trust/discord/BotCommandFactoryTests.java
@@ -8,10 +8,9 @@
 
 import java.util.Map;
 
-import com.github.sfxd.trust.core.instances.InstanceService;
-import com.github.sfxd.trust.core.instanceusers.InstanceUserService;
-import com.github.sfxd.trust.core.users.UserService;
-
+import com.github.sfxd.trust.core.instances.InstanceRepository;
+import com.github.sfxd.trust.core.subscription.SubscriptionRepository;
+import com.github.sfxd.trust.core.users.UserRepository;
 import org.junit.jupiter.api.Test;
 
 import net.dv8tion.jda.api.entities.Message;
@@ -55,9 +54,9 @@ private static void assertCommandClass(String name, Class<? extends BotCommand>
     }
 
     private static void assertCommandClass(String name, Map<String, String> options, Class<? extends BotCommand> clazz) {
-        var isService = mock(InstanceUserService.class);
-        var subscriberService = mock(UserService.class);
-        var instanceService = mock(InstanceService.class);
+        var isService = mock(SubscriptionRepository.class);
+        var subscriberService = mock(UserRepository.class);
+        var instanceService = mock(InstanceRepository.class);
         var event = mock(SlashCommandEvent.class);
         var message = mock(Message.class);
         var jda = mock(JDA.class);
@@ -76,9 +75,9 @@ private static void assertCommandClass(String name, Map<String, String> options,
         }
 
         var factory = new BotCommandFactory(
-            isService,
-            subscriberService,
             instanceService,
+            subscriberService,
+            isService,
             jda
         );
 
diff --git a/src/test/java/com/github/sfxd/trust/discord/SubscribeBotCommandTests.java b/src/test/java/com/github/sfxd/trust/discord/SubscribeBotCommandTests.java
index e9d88b6..46799ec 100644
--- a/src/test/java/com/github/sfxd/trust/discord/SubscribeBotCommandTests.java
+++ b/src/test/java/com/github/sfxd/trust/discord/SubscribeBotCommandTests.java
@@ -1,7 +1,6 @@
 package com.github.sfxd.trust.discord;
 
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -9,12 +8,12 @@
 import java.util.Optional;
 
 import com.github.sfxd.trust.core.instances.Instance;
-import com.github.sfxd.trust.core.instances.InstanceService;
-import com.github.sfxd.trust.core.instanceusers.InstanceUser;
-import com.github.sfxd.trust.core.instanceusers.InstanceUserService;
-import com.github.sfxd.trust.core.users.UserService;
+import com.github.sfxd.trust.core.instances.InstanceRepository;
+import com.github.sfxd.trust.core.subscription.Subscription;
+import com.github.sfxd.trust.core.subscription.SubscriptionRepository;
 import com.github.sfxd.trust.core.users.User;
 
+import com.github.sfxd.trust.core.users.UserRepository;
 import org.junit.jupiter.api.Test;
 
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
@@ -24,20 +23,20 @@ class SubscribeBotCommandTests {
 
     @Test
     void it_should_respond_with_a_message_if_the_instance_is_not_found() {
-        var subscriberService = mock(UserService.class);
-        var isService = mock(InstanceUserService.class);
-        var instanceService = mock(InstanceService.class);
+        var subscriberService = mock(UserRepository.class);
+        var isService = mock(SubscriptionRepository.class);
+        var instanceService = mock(InstanceRepository.class);
         var event = mock(SlashCommandEvent.class);
         var replyAction = mock(ReplyAction.class);
 
         when(event.reply(anyString())).thenReturn(replyAction);
-        when(instanceService.findByKey(anyString())).thenReturn(Optional.empty());
+        when(instanceService.findByKey(anyString())).thenReturn(null);
 
         var command = new SubscribeBotCommand(
             event,
             instanceService,
-            isService,
             subscriberService,
+            isService,
             "na99"
         );
 
@@ -49,9 +48,9 @@ void it_should_respond_with_a_message_if_the_instance_is_not_found() {
 
     @Test
     void it_should_create_a_new_subscription_only_if_there_isnt_one() throws Exception {
-        var subscriberService = mock(UserService.class);
-        var isService = mock(InstanceUserService.class);
-        var instanceService = mock(InstanceService.class);
+        var subscriberService = mock(UserRepository.class);
+        var isService = mock(SubscriptionRepository.class);
+        var instanceService = mock(InstanceRepository.class);
         var event = mock(SlashCommandEvent.class);
         var user = mock(net.dv8tion.jda.api.entities.User.class);
         var subscriber = new User("");
@@ -63,20 +62,20 @@ void it_should_create_a_new_subscription_only_if_there_isnt_one() throws Excepti
 
         var instance = new Instance();
         instance.setId(1L);
-        when(instanceService.findByKey(anyString())).thenReturn(Optional.of(instance));
-        when(subscriberService.findByUsername(anyString())).thenReturn(Optional.of(subscriber));
-        when(isService.findByInstanceIdAndUserId(anyLong(), anyLong()))
-            .thenReturn(Optional.empty());
+        when(instanceService.findByKey(anyString())).thenReturn(instance);
+        when(subscriberService.findByUsername(anyString())).thenReturn(subscriber);
+        when(isService.findByInstanceAndUser(any(), any()))
+            .thenReturn(null);
 
         var command = new SubscribeBotCommand(
             event,
             instanceService,
-            isService,
             subscriberService,
+            isService,
             "na99"
         );
 
         command.run();
-        verify(isService).insert(new InstanceUser(instance, new User("")));
+        verify(isService).insert(new Subscription(instance, new User("")));
     }
 }
diff --git a/src/test/java/com/github/sfxd/trust/discord/UnsubscribeBotCommandTests.java b/src/test/java/com/github/sfxd/trust/discord/UnsubscribeBotCommandTests.java
index e8c6cbc..81c7de9 100644
--- a/src/test/java/com/github/sfxd/trust/discord/UnsubscribeBotCommandTests.java
+++ b/src/test/java/com/github/sfxd/trust/discord/UnsubscribeBotCommandTests.java
@@ -5,11 +5,9 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.Optional;
-
-import com.github.sfxd.trust.core.instanceusers.InstanceUser;
-import com.github.sfxd.trust.core.instanceusers.InstanceUserService;
+import com.github.sfxd.trust.core.subscription.Subscription;
 
+import com.github.sfxd.trust.core.subscription.SubscriptionRepository;
 import org.junit.jupiter.api.Test;
 
 import net.dv8tion.jda.api.entities.User;
@@ -21,17 +19,17 @@ class UnsubscribeBotCommandTests {
     @Test
     void it_should_delete_the_subscription_if_found() throws Exception {
         var event = mock(SlashCommandEvent.class);
-        var isService = mock(InstanceUserService.class);
+        var isService = mock(SubscriptionRepository.class);
         var key = "NA99";
         var username = "george";
         var user = mock(User.class);
-        var subscription = new InstanceUser(null, null);
+        var subscription = new Subscription(null, null);
         var action = mock(ReplyAction.class);
 
         when(event.getUser()).thenReturn(user);
         when(user.getId()).thenReturn(username);
         when(event.reply(anyString())).thenReturn(action);
-        when(isService.findByKeyAndUsername(key, username)).thenReturn(Optional.of(subscription));
+        when(isService.findByKeyAndUsername(key, username)).thenReturn(subscription);
 
         var command = new UnsubscribeBotCommand(event, key, isService);
         command.run();
diff --git a/src/test/java/com/github/sfxd/trust/integrations/InstanceRefreshConsumerTests.java b/src/test/java/com/github/sfxd/trust/integrations/InstanceRefreshConsumerTests.java
index dfd2c56..0aaecd6 100644
--- a/src/test/java/com/github/sfxd/trust/integrations/InstanceRefreshConsumerTests.java
+++ b/src/test/java/com/github/sfxd/trust/integrations/InstanceRefreshConsumerTests.java
@@ -8,27 +8,27 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.github.sfxd.trust.core.Messages;
 import com.github.sfxd.trust.core.instances.Instance;
-import com.github.sfxd.trust.core.instances.InstanceService;
 
+import com.github.sfxd.trust.core.instances.InstanceRepository;
 import org.junit.jupiter.api.Test;
 
 class InstanceRefreshConsumerTests {
 
     @Test
     void it_should_update_the_table_with_the_new_data() {
-        var instanceService = mock(InstanceService.class);
+        var instanceRepo = mock(InstanceRepository.class);
         var instances = new ArrayList<Instance>();
         var instance = new Instance();
         instance.setKey("NA99");
         var previews = List.of(instance);
 
-        when(instanceService.findByKeyIn(anySet())).thenReturn(instances.stream());
+        when(instanceRepo.findByKeyIn(anySet())).thenReturn(instances);
 
-        var consumer = new InstanceRefreshConsumer(instanceService);
+        var consumer = new InstanceRefreshConsumer(instanceRepo, mock(Messages.class));
         consumer.accept(previews);
 
-        verify(instanceService).insert(previews);
-        verify(instanceService).update(new ArrayList<Instance>());
+        verify(instanceRepo).save(previews);
     }
 }