diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php
index 453d32a4d..e25d0c867 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php
@@ -15,9 +15,8 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdComposition;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\Persistence\ObjectRepository;
 
-class HouseholdCompositionRepository implements ObjectRepository
+final class HouseholdCompositionRepository implements HouseholdCompositionRepositoryInterface
 {
     private EntityRepository $repository;
 
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepositoryInterface.php
new file mode 100644
index 000000000..84c62392b
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepositoryInterface.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Repository\Household;
+
+use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Household\HouseholdComposition;
+use Doctrine\Persistence\ObjectRepository;
+
+interface HouseholdCompositionRepositoryInterface extends ObjectRepository
+{
+    public function countByHousehold(Household $household): int;
+
+    public function find($id): ?HouseholdComposition;
+
+    /**
+     * @return array|HouseholdComposition[]
+     */
+    public function findAll(): array;
+
+    /**
+     * @param int $limit
+     * @param int $offset
+     *
+     * @return array|object[]|HouseholdComposition[]
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array;
+
+    /**
+     * @return array|HouseholdComposition[]|object[]
+     */
+    public function findByHousehold(Household $household, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+
+    public function findOneBy(array $criteria): ?HouseholdComposition;
+
+    public function getClassName(): string;
+}
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php
index e957755a4..04110942b 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php
@@ -14,9 +14,8 @@ namespace Chill\PersonBundle\Repository\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdCompositionType;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\Persistence\ObjectRepository;
 
-class HouseholdCompositionTypeRepository implements ObjectRepository
+final class HouseholdCompositionTypeRepository implements HouseholdCompositionTypeRepositoryInterface
 {
     private EntityRepository $repository;
 
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepositoryInterface.php
new file mode 100644
index 000000000..5fede423a
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepositoryInterface.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Repository\Household;
+
+use Chill\PersonBundle\Entity\Household\HouseholdCompositionType;
+use Doctrine\Persistence\ObjectRepository;
+
+interface HouseholdCompositionTypeRepositoryInterface extends ObjectRepository
+{
+    public function find($id): ?HouseholdCompositionType;
+
+    /**
+     * @return array|HouseholdCompositionType[]|object[]
+     */
+    public function findAll(): array;
+
+    /**
+     * @return array|HouseholdCompositionType[]
+     */
+    public function findAllActive(): array;
+
+    /**
+     * @param $limit
+     * @param $offset
+     *
+     * @return array|HouseholdCompositionType[]|object[]
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array;
+
+    public function findOneBy(array $criteria): ?HouseholdCompositionType;
+
+    public function getClassName(): string;
+}