diff --git a/src/Common/DoctrineListRepresentationFactory.php b/src/Common/DoctrineListRepresentationFactory.php
index 30b28d3..643bd2a 100644
--- a/src/Common/DoctrineListRepresentationFactory.php
+++ b/src/Common/DoctrineListRepresentationFactory.php
@@ -4,6 +4,7 @@
 
 namespace Manuxi\SuluEventBundle\Common;
 
+use Sulu\Bundle\MediaBundle\Media\Manager\MediaManagerInterface;
 use Sulu\Component\Rest\ListBuilder\Doctrine\DoctrineListBuilderFactory;
 use Sulu\Component\Rest\ListBuilder\Doctrine\FieldDescriptor\DoctrineFieldDescriptor;
 use Sulu\Component\Rest\ListBuilder\Metadata\FieldDescriptorFactoryInterface;
@@ -15,15 +16,18 @@ class DoctrineListRepresentationFactory
     private $restHelper;
     private $listBuilderFactory;
     private $fieldDescriptorFactory;
+    private $mediaManager;
 
     public function __construct(
         RestHelperInterface $restHelper,
         DoctrineListBuilderFactory $listBuilderFactory,
-        FieldDescriptorFactoryInterface $fieldDescriptorFactory
+        FieldDescriptorFactoryInterface $fieldDescriptorFactory,
+        MediaManagerInterface $mediaManager
     ) {
         $this->restHelper             = $restHelper;
         $this->listBuilderFactory     = $listBuilderFactory;
         $this->fieldDescriptorFactory = $fieldDescriptorFactory;
+        $this->mediaManager           = $mediaManager;
     }
 
     /**
@@ -34,7 +38,8 @@ public function createDoctrineListRepresentation(
         string $resourceKey,
         array $filters = [],
         array $parameters = []
-    ): PaginatedRepresentation {
+    ): PaginatedRepresentation
+    {
         /** @var DoctrineFieldDescriptor[] $fieldDescriptors */
         $fieldDescriptors = $this->fieldDescriptorFactory->getFieldDescriptors($resourceKey);
 
@@ -50,6 +55,7 @@ public function createDoctrineListRepresentation(
         }
 
         $list = $listBuilder->execute();
+        $list = $this->addImagesToListElements($list, $parameters['locale'] ?? null);
 
         return new PaginatedRepresentation(
             $list,
@@ -59,4 +65,23 @@ public function createDoctrineListRepresentation(
             (int) $listBuilder->count()
         );
     }
+
+    /**
+     * @param mixed[]
+     */
+    private function addImagesToListElements(array $listeElements, ?string $locale): array
+    {
+        $ids = array_filter(array_column($listeElements, 'image'));
+        $images = $this->mediaManager->getFormatUrls($ids, $locale);
+        foreach ($listeElements as $key => $element) {
+            if (\array_key_exists('image', $element)
+                && $element['image']
+                && \array_key_exists($element['image'], $images)
+            ) {
+                $listeElements[$key]['image'] = $images[$element['image']];
+            }
+        }
+
+        return $listeElements;
+    }
 }
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index b0660fd..aec24b8 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -5,7 +5,19 @@
 namespace Manuxi\SuluEventBundle\DependencyInjection;
 
 use Manuxi\SuluEventBundle\Entity\Event;
+use Manuxi\SuluEventBundle\Entity\EventExcerpt;
+use Manuxi\SuluEventBundle\Entity\EventExcerptTranslation;
+use Manuxi\SuluEventBundle\Entity\EventSeo;
+use Manuxi\SuluEventBundle\Entity\EventSeoTranslation;
+use Manuxi\SuluEventBundle\Entity\EventTranslation;
+use Manuxi\SuluEventBundle\Entity\Location;
+use Manuxi\SuluEventBundle\Repository\EventExcerptRepository;
+use Manuxi\SuluEventBundle\Repository\EventExcerptTranslationRepository;
 use Manuxi\SuluEventBundle\Repository\EventRepository;
+use Manuxi\SuluEventBundle\Repository\EventSeoRepository;
+use Manuxi\SuluEventBundle\Repository\EventSeoTranslationRepository;
+use Manuxi\SuluEventBundle\Repository\EventTranslationRepository;
+use Manuxi\SuluEventBundle\Repository\LocationRepository;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
@@ -17,20 +29,62 @@ public function getConfigTreeBuilder()
         $treeBuilder = new TreeBuilder('sulu_event');
         $root = $treeBuilder->getRootNode();
 
-//        $root->children()
-//            ->arrayNode('objects')
-//                ->addDefaultsIfNotSet()
-//                ->children()
-//                    ->arrayNode('news')
-//                        ->addDefaultsIfNotSet()
-//                            ->children()
-//                                ->scalarNode('model')->defaultValue(Event::class)->end()
-//                                ->scalarNode('repository')->defaultValue(EventRepository::class)->end()
-//                            ->end()
-//                        ->end()
-//                    ->end()
-//                ->end()
-//            ->end();
+        $root
+            ->children()
+            ->arrayNode('objects')
+                ->addDefaultsIfNotSet()
+                ->children()
+                    ->arrayNode('event')
+                        ->addDefaultsIfNotSet()
+                        ->children()
+                            ->scalarNode('model')->defaultValue(Event::class)->end()
+                            ->scalarNode('repository')->defaultValue(EventRepository::class)->end()
+                        ->end()
+                    ->end()
+                    ->arrayNode('event_translation')
+                        ->addDefaultsIfNotSet()
+                        ->children()
+                            ->scalarNode('model')->defaultValue(EventTranslation::class)->end()
+                            ->scalarNode('repository')->defaultValue(EventTranslationRepository::class)->end()
+                        ->end()
+                    ->end()
+                    ->arrayNode('event_seo')
+                        ->addDefaultsIfNotSet()
+                        ->children()
+                            ->scalarNode('model')->defaultValue(EventSeo::class)->end()
+                            ->scalarNode('repository')->defaultValue(EventSeoRepository::class)->end()
+                        ->end()
+                    ->end()
+                    ->arrayNode('event_seo_translation')
+                        ->addDefaultsIfNotSet()
+                        ->children()
+                            ->scalarNode('model')->defaultValue(EventSeoTranslation::class)->end()
+                            ->scalarNode('repository')->defaultValue(EventSeoTranslationRepository::class)->end()
+                        ->end()
+                    ->end()
+                    ->arrayNode('event_excerpt')
+                        ->addDefaultsIfNotSet()
+                        ->children()
+                            ->scalarNode('model')->defaultValue(EventExcerpt::class)->end()
+                            ->scalarNode('repository')->defaultValue(EventExcerptRepository::class)->end()
+                        ->end()
+                    ->end()
+                    ->arrayNode('event_excerpt_translation')
+                        ->addDefaultsIfNotSet()
+                        ->children()
+                            ->scalarNode('model')->defaultValue(EventExcerptTranslation::class)->end()
+                            ->scalarNode('repository')->defaultValue(EventExcerptTranslationRepository::class)->end()
+                        ->end()
+                    ->end()
+                    ->arrayNode('location')
+                        ->addDefaultsIfNotSet()
+                        ->children()
+                            ->scalarNode('model')->defaultValue(Location::class)->end()
+                            ->scalarNode('repository')->defaultValue(LocationRepository::class)->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end();
 
         return $treeBuilder;
     }
diff --git a/src/DependencyInjection/SuluEventExtension.php b/src/DependencyInjection/SuluEventExtension.php
index e11a2d2..0724756 100644
--- a/src/DependencyInjection/SuluEventExtension.php
+++ b/src/DependencyInjection/SuluEventExtension.php
@@ -7,6 +7,7 @@
 use Manuxi\SuluEventBundle\Admin\EventAdmin;
 use Manuxi\SuluEventBundle\Entity\Event;
 use Manuxi\SuluEventBundle\Entity\Location;
+use Sulu\Bundle\PersistenceBundle\DependencyInjection\PersistenceExtensionTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
@@ -15,7 +16,11 @@
 
 class SuluEventExtension extends Extension implements PrependExtensionInterface
 {
+    use PersistenceExtensionTrait;
 
+    /**
+     * @throws \Exception
+     */
     public function load(array $configs, ContainerBuilder $container)
     {
 
@@ -26,8 +31,7 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('services.xml');
         $loader->load('controller.xml');
 
-
-//        $this->configurePersistence($config['objects'], $container);
+        $this->configurePersistence($config['objects'], $container);
     }
 
     public function prepend(ContainerBuilder $container)
diff --git a/src/Entity/Event.php b/src/Entity/Event.php
index 20eade3..e728223 100644
--- a/src/Entity/Event.php
+++ b/src/Entity/Event.php
@@ -77,7 +77,7 @@ class Event implements AuditableTranslationInterface
      */
     private $translations;
 
-    protected $locale = 'en';
+    private $locale = 'en';
 
     private $ext = [];
 
diff --git a/src/Entity/Location.php b/src/Entity/Location.php
index 535f7a2..544b1c7 100644
--- a/src/Entity/Location.php
+++ b/src/Entity/Location.php
@@ -6,6 +6,7 @@
 
 use Manuxi\SuluEventBundle\Repository\LocationRepository;
 use Doctrine\ORM\Mapping as ORM;
+use Sulu\Bundle\MediaBundle\Entity\MediaInterface;
 
 /**
  * @ORM\Entity
@@ -50,6 +51,11 @@ class Location
      */
     private $city;
 
+    /**
+     * @ORM\Column(type="string", length=255, nullable=true)
+     */
+    private $state;
+
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
      */
@@ -60,6 +66,11 @@ class Location
      */
     private $notes;
 
+    /**
+     * @ORM\ManyToOne(targetEntity="Sulu\Bundle\MediaBundle\Entity\MediaInterface")
+     */
+    private $image;
+
     public function getId(): ?int
     {
         return $this->id;
@@ -120,6 +131,17 @@ public function setCity(?string $city): self
         return $this;
     }
 
+    public function getState(): ?string
+    {
+        return $this->state;
+    }
+
+    public function setState(?string $state): self
+    {
+        $this->state = $state;
+        return $this;
+    }
+
     public function getCountryCode(): ?string
     {
         return $this->countryCode;
@@ -142,4 +164,28 @@ public function setNotes($notes): self
         return $this;
     }
 
+    public function getImage(): ?MediaInterface
+    {
+        return $this->image;
+    }
+
+    /**
+     * @return array<string, mixed>|null
+     */
+    public function getImageData(): ?array
+    {
+        if (!$this->image) {
+            return null;
+        }
+
+        return [
+            'id' => $this->image->getId(),
+        ];
+    }
+
+    public function setImage(?MediaInterface $image): self
+    {
+        $this->image = $image;
+        return $this;
+    }
 }
diff --git a/src/Entity/Models/LocationModel.php b/src/Entity/Models/LocationModel.php
index 599219d..75ba788 100644
--- a/src/Entity/Models/LocationModel.php
+++ b/src/Entity/Models/LocationModel.php
@@ -10,6 +10,7 @@
 use Manuxi\SuluEventBundle\Entity\Location;
 use Manuxi\SuluEventBundle\Entity\Traits\ArrayPropertyTrait;
 use Manuxi\SuluEventBundle\Repository\LocationRepository;
+use Sulu\Bundle\MediaBundle\Entity\MediaRepositoryInterface;
 use Sulu\Component\Rest\Exception\EntityNotFoundException;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -18,14 +19,18 @@ class LocationModel implements LocationModelInterface
     use ArrayPropertyTrait;
 
     private $locationRepository;
+    private $mediaRepository;
 
     public function __construct(
-        LocationRepository $locationRepository
+        LocationRepository $locationRepository,
+        MediaRepositoryInterface $mediaRepository
     ) {
         $this->locationRepository = $locationRepository;
+        $this->mediaRepository = $mediaRepository;
     }
 
     /**
+     * @throws EntityNotFoundException
      * @throws ORMException
      * @throws OptimisticLockException
      */
@@ -43,7 +48,7 @@ public function createLocation(Request $request): Location
      */
     public function updateLocation(int $id, Request $request): Location
     {
-        $location = $this->getLocation($id, $request);
+        $location = $this->getLocation($id);
         $location = $this->mapDataToEntity($location, $request->request->all());
         return $this->locationRepository->save($location);
     }
@@ -69,6 +74,9 @@ public function deleteLocation(int $id): void
         $this->locationRepository->remove($id);
     }
 
+    /**
+     * @throws EntityNotFoundException
+     */
     private function mapDataToEntity(Location $location, array $data): Location
     {
         $name = $this->getProperty($data, 'name');
@@ -91,6 +99,10 @@ private function mapDataToEntity(Location $location, array $data): Location
         if ($postalCode) {
             $location->setPostalCode($postalCode);
         }
+        $state = $this->getProperty($data, 'state');
+        if ($state) {
+            $location->setState($state);
+        }
         $countryCode = $this->getProperty($data, 'countryCode');
         if ($countryCode) {
             $location->setCountryCode($countryCode);
@@ -99,6 +111,14 @@ private function mapDataToEntity(Location $location, array $data): Location
         if ($notes) {
             $location->setNotes($notes);
         }
+        $imageId = $this->getPropertyMulti($data, ['image', 'id']);
+        if ($imageId) {
+            $image = $this->mediaRepository->findMediaById((int) $imageId);
+            if (!$image) {
+                throw new EntityNotFoundException($this->mediaRepository->getClassName(), $imageId);
+            }
+            $location->setImage($image);
+        }
         return $location;
     }
 }
diff --git a/src/Resources/config/controller.xml b/src/Resources/config/controller.xml
index 03b3674..753c68f 100644
--- a/src/Resources/config/controller.xml
+++ b/src/Resources/config/controller.xml
@@ -4,9 +4,7 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <!-- Controllers -->
-        <service id="Manuxi\SuluEventBundle\Controller\Admin\LocationController"
-                 public="true">
+        <service id="Manuxi\SuluEventBundle\Controller\Admin\LocationController" public="true">
             <argument type="service" id="sulu_event.model.location"/>
             <argument type="service" id="sulu_event.doctrine_list_representation_factory"/>
             <argument type="service" id="fos_rest.view_handler.default"/>
@@ -15,8 +13,7 @@
             <tag name="sulu.context" context="admin"/>
         </service>
 
-        <service id="Manuxi\SuluEventBundle\Controller\Admin\EventController"
-                 public="true">
+        <service id="Manuxi\SuluEventBundle\Controller\Admin\EventController" public="true">
             <argument type="service" id="sulu_event.model.event"/>
             <argument type="service" id="sulu_event.model.event_seo"/>
             <argument type="service" id="sulu_event.model.event_excerpt"/>
@@ -29,8 +26,7 @@
             <tag name="sulu.context" context="admin"/>
         </service>
 
-        <service id="Manuxi\SuluEventBundle\Controller\Website\EventController"
-                 public="true">
+        <service id="Manuxi\SuluEventBundle\Controller\Website\EventController" public="true">
             <argument type="service" id="request_stack"/>
             <argument type="service" id="sulu_media.media_manager"/>
             <argument type="service" id="sulu_event.repository.event"/>
diff --git a/src/Resources/config/forms/location_details.xml b/src/Resources/config/forms/location_details.xml
index 56cc649..abe3b6c 100644
--- a/src/Resources/config/forms/location_details.xml
+++ b/src/Resources/config/forms/location_details.xml
@@ -6,12 +6,21 @@
     <key>location_details</key>
 
     <properties>
-        <property name="name" type="text_line" mandatory="true">
+        <property name="name" type="text_line" colspan="8" mandatory="true">
             <meta>
                 <title>sulu_admin.name</title>
             </meta>
         </property>
 
+        <property name="image" type="single_media_selection" colspan="4">
+            <meta>
+                <title>sulu_event.image</title>
+            </meta>
+            <params>
+                <param name="types" value="image"/>
+            </params>
+        </property>
+
         <property name="street" type="text_line" colspan="9">
             <meta>
                 <title>sulu_contact.street</title>
@@ -30,13 +39,19 @@
             </meta>
         </property>
 
-        <property name="city" type="text_line" colspan="6">
+        <property name="city" type="text_line" colspan="9">
             <meta>
                 <title>sulu_contact.city</title>
             </meta>
         </property>
 
-        <property name="countryCode" type="single_select" colspan="3">
+        <property name="state" type="text_line" colspan="6">
+            <meta>
+                <title>sulu_contact.state</title>
+            </meta>
+        </property>
+
+        <property name="countryCode" type="single_select" colspan="6">
             <meta>
                 <title>sulu_contact.country</title>
             </meta>
diff --git a/src/Resources/config/lists/events.xml b/src/Resources/config/lists/events.xml
index baacd6f..a8a5457 100644
--- a/src/Resources/config/lists/events.xml
+++ b/src/Resources/config/lists/events.xml
@@ -4,23 +4,23 @@
 
     <joins name="translation">
         <join>
-            <entity-name>Manuxi\SuluEventBundle\Entity\EventTranslation</entity-name>
-            <field-name>Manuxi\SuluEventBundle\Entity\Event.translations</field-name>
-            <condition>Manuxi\SuluEventBundle\Entity\EventTranslation.locale = :locale</condition>
+            <entity-name>%sulu.model.event_translation.class%</entity-name>
+            <field-name>%sulu.model.event.class%.translations</field-name>
+            <condition>%sulu.model.event_translation.class%.locale = :locale</condition>
         </join>
     </joins>
 
     <joins name="location">
         <join>
-            <entity-name>Manuxi\SuluEventBundle\Entity\Location</entity-name>
-            <field-name>Manuxi\SuluEventBundle\Entity\Event.location</field-name>
+            <entity-name>%sulu.model.location.class%</entity-name>
+            <field-name>%sulu.model.event.class%.location</field-name>
         </join>
     </joins>
 
     <joins name="changer" ref="translation">
         <join>
             <entity-name>%sulu.model.user.class%_changer</entity-name>
-            <field-name>Manuxi\SuluEventBundle\Entity\EventTranslation.changer</field-name>
+            <field-name>%sulu.model.event_translation.class%.changer</field-name>
         </join>
         <join>
             <entity-name>%sulu.model.contact.class%_changer</entity-name>
@@ -31,7 +31,7 @@
     <joins name="creator" ref="translation">
         <join>
             <entity-name>%sulu.model.user.class%_creator</entity-name>
-            <field-name>Manuxi\SuluEventBundle\Entity\EventTranslation.creator</field-name>
+            <field-name>%sulu.model.event_translation.class%.creator</field-name>
         </join>
         <join>
             <entity-name>%sulu.model.contact.class%_creator</entity-name>
@@ -42,55 +42,68 @@
     <properties>
         <property name="id" visibility="no" translation="sulu_admin.id">
             <field-name>id</field-name>
-            <entity-name>Manuxi\SuluEventBundle\Entity\Event</entity-name>
+            <entity-name>%sulu.model.event.class%</entity-name>
         </property>
 
         <property name="title" visibility="always" searchability="yes" translation="sulu_admin.title">
             <field-name>title</field-name>
-            <entity-name>Manuxi\SuluEventBundle\Entity\EventTranslation</entity-name>
+            <entity-name>%sulu.model.event_translation.class%</entity-name>
 
             <joins ref="translation"/>
         </property>
 
+        <property name="image" visibility="always" translation="sulu_event.image" sortable="false">
+            <field-name>id</field-name>
+            <entity-name>SuluMediaBundle:Media</entity-name>
+            <joins>
+                <join>
+                    <entity-name>SuluMediaBundle:Media</entity-name>
+                    <field-name>%sulu.model.event.class%.image</field-name>
+                </join>
+            </joins>
+
+            <transformer type="thumbnails"/>
+        </property>
+
         <property name="locationName" visibility="always" searchability="yes" translation="sulu_event.location">
             <field-name>name</field-name>
-            <entity-name>Manuxi\SuluEventBundle\Entity\Location</entity-name>
+            <entity-name>%sulu.model.location.class%</entity-name>
 
             <joins ref="location"/>
         </property>
 
         <property name="teaser" visibility="no" searchability="yes" translation="sulu_event.teaser">
             <field-name>teaser</field-name>
-            <entity-name>Manuxi\SuluEventBundle\Entity\EventTranslation</entity-name>
+            <entity-name>%sulu.model.event_translation.class%</entity-name>
 
             <joins ref="translation"/>
         </property>
 
         <property name="description" visibility="no" searchability="yes" translation="sulu_event.description">
             <field-name>description</field-name>
-            <entity-name>Manuxi\SuluEventBundle\Entity\EventTranslation</entity-name>
+            <entity-name>%sulu.model.event_translation.class%</entity-name>
 
             <joins ref="translation"/>
         </property>
 
         <property name="enabled" visibility="yes" translation="sulu_event.enabled" type="bool">
             <field-name>enabled</field-name>
-            <entity-name>Manuxi\SuluEventBundle\Entity\Event</entity-name>
+            <entity-name>%sulu.model.event.class%</entity-name>
         </property>
 
         <property name="startDate" visibility="always" translation="sulu_event.start_date" type="date">
             <field-name>startDate</field-name>
-            <entity-name>Manuxi\SuluEventBundle\Entity\Event</entity-name>
+            <entity-name>%sulu.model.event.class%</entity-name>
         </property>
 
         <property name="endDate" visibility="always" translation="sulu_event.end_date" type="date">
             <field-name>endDate</field-name>
-            <entity-name>Manuxi\SuluEventBundle\Entity\Event</entity-name>
+            <entity-name>%sulu.model.event.class%</entity-name>
         </property>
 
         <property name="created" translation="sulu_admin.created" type="datetime" visibility="yes">
             <field-name>created</field-name>
-            <entity-name>Manuxi\SuluEventBundle\Entity\EventTranslation</entity-name>
+            <entity-name>%sulu.model.event_translation.class%</entity-name>
 
             <joins ref="translation"/>
         </property>
@@ -112,7 +125,7 @@
 
         <property name="changed" translation="sulu_admin.changed" type="datetime" visibility="no">
             <field-name>changed</field-name>
-            <entity-name>Manuxi\SuluEventBundle\Entity\EventTranslation</entity-name>
+            <entity-name>%sulu.model.event_translation.class%</entity-name>
 
             <joins ref="translation"/>
         </property>
diff --git a/src/Resources/config/lists/locations.xml b/src/Resources/config/lists/locations.xml
index 59b5c1f..ac51306 100644
--- a/src/Resources/config/lists/locations.xml
+++ b/src/Resources/config/lists/locations.xml
@@ -5,42 +5,60 @@
     <properties>
         <property name="id" visibility="no" translation="sulu_admin.id">
             <field-name>id</field-name>
-            <entity-name>Manuxi\SuluEventBundle\Entity\Location</entity-name>
+            <entity-name>%sulu.model.location.class%</entity-name>
         </property>
 
         <property name="name" visibility="always" searchability="yes" translation="sulu_admin.name">
             <field-name>name</field-name>
-            <entity-name>Manuxi\SuluEventBundle\Entity\Location</entity-name>
+            <entity-name>%sulu.model.location.class%</entity-name>
+        </property>
+
+        <property name="image" visibility="always" translation="sulu_event.image" sortable="false">
+            <field-name>id</field-name>
+            <entity-name>SuluMediaBundle:Media</entity-name>
+            <joins>
+                <join>
+                    <entity-name>SuluMediaBundle:Media</entity-name>
+                    <field-name>%sulu.model.location.class%.image</field-name>
+                </join>
+            </joins>
+
+            <transformer type="thumbnails"/>
         </property>
 
         <property name="street" visibility="yes" searchability="yes" translation="sulu_contact.street">
             <field-name>street</field-name>
-            <entity-name>Manuxi\SuluEventBundle\Entity\Location</entity-name>
+            <entity-name>%sulu.model.location.class%</entity-name>
         </property>
 
         <property name="number" visibility="yes" searchability="yes" translation="sulu_contact.number">
             <field-name>number</field-name>
-            <entity-name>Manuxi\SuluEventBundle\Entity\Location</entity-name>
+            <entity-name>%sulu.model.location.class%</entity-name>
         </property>
 
         <property name="postalCode" visibility="yes" searchability="yes" translation="sulu_contact.zip">
             <field-name>postalCode</field-name>
-            <entity-name>Manuxi\SuluEventBundle\Entity\Location</entity-name>
+            <entity-name>%sulu.model.location.class%</entity-name>
         </property>
 
         <property name="city" visibility="yes" searchability="yes" translation="sulu_contact.city">
             <field-name>city</field-name>
-            <entity-name>Manuxi\SuluEventBundle\Entity\Location</entity-name>
+            <entity-name>%sulu.model.location.class%</entity-name>
+        </property>
+
+        <property name="state" visibility="yes" searchability="yes" translation="sulu_contact.state">
+            <field-name>state</field-name>
+            <entity-name>%sulu.model.location.class%</entity-name>
         </property>
 
         <property name="countryCode" visibility="yes" searchability="yes" translation="sulu_contact.country">
             <field-name>countryCode</field-name>
-            <entity-name>Manuxi\SuluEventBundle\Entity\Location</entity-name>
+            <entity-name>%sulu.model.location.class%</entity-name>
         </property>
 
         <property name="notes" visibility="no" searchability="yes" translation="sulu_event.notes">
             <field-name>notes</field-name>
-            <entity-name>Manuxi\SuluEventBundle\Entity\Location</entity-name>
+            <entity-name>%sulu.model.location.class%</entity-name>
         </property>
     </properties>
 </list>
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index 590e67f..0914bf0 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -25,6 +25,7 @@
             <argument type="service" id="sulu_core.rest_helper"/>
             <argument type="service" id="sulu_core.doctrine_list_builder_factory"/>
             <argument type="service" id="sulu_core.list_builder.field_descriptor_factory"/>
+            <argument type="service" id="sulu_media.media_manager"/>
 
             <tag name="sulu.context" context="admin"/>
         </service>
@@ -118,6 +119,7 @@
 
         <service id="sulu_event.model.location" class="Manuxi\SuluEventBundle\Entity\Models\LocationModel">
             <argument type="service" id="sulu_event.repository.location"/>
+            <argument type="service" id="sulu.repository.media"/>
         </service>
 
         <service id="sulu_event.object_provider" public="true" class="Manuxi\SuluEventBundle\Preview\EventObjectProvider">
diff --git a/tests/Unit/Entity/LocationTest.php b/tests/Unit/Entity/LocationTest.php
index e154e7f..eae3dde 100644
--- a/tests/Unit/Entity/LocationTest.php
+++ b/tests/Unit/Entity/LocationTest.php
@@ -6,6 +6,7 @@
 
 use Manuxi\SuluEventBundle\Entity\Location;
 use PHPUnit\Framework\TestCase;
+use Sulu\Bundle\MediaBundle\Entity\MediaInterface;
 
 class LocationTest extends TestCase
 {
@@ -19,17 +20,17 @@ protected function setUp(): void
     public function testName(): void
     {
         $this->assertNull($this->location->getName());
-        $this->assertSame($this->location, $this->location->setName('Sulu GmbH'));
+        $this->assertSame($this->location, $this->location->setName('Schlosshotel'));
         $this->assertNotNull($this->location->getName());
-        $this->assertSame('Sulu GmbH', $this->location->getName());
+        $this->assertSame('Schlosshotel', $this->location->getName());
     }
 
     public function testStreet(): void
     {
         $this->assertNull($this->location->getStreet());
-        $this->assertSame($this->location, $this->location->setStreet('Teststreet'));
+        $this->assertSame($this->location, $this->location->setStreet('Luetzowplatz'));
         $this->assertNotNull($this->location->getStreet());
-        $this->assertSame('Teststreet', $this->location->getStreet());
+        $this->assertSame('Luetzowplatz', $this->location->getStreet());
     }
 
     public function testNumber(): void
@@ -43,24 +44,53 @@ public function testNumber(): void
     public function testPostalCode(): void
     {
         $this->assertNull($this->location->getPostalCode());
-        $this->assertSame($this->location, $this->location->setPostalCode('6850'));
+        $this->assertSame($this->location, $this->location->setPostalCode('54636'));
         $this->assertNotNull($this->location->getPostalCode());
-        $this->assertSame('6850', $this->location->getPostalCode());
+        $this->assertSame('54636', $this->location->getPostalCode());
     }
 
     public function testCity(): void
     {
         $this->assertNull($this->location->getCity());
-        $this->assertSame($this->location, $this->location->setCity('Dornbirn'));
+        $this->assertSame($this->location, $this->location->setCity('Wiersdorf'));
         $this->assertNotNull($this->location->getCity());
-        $this->assertSame('Dornbirn', $this->location->getCity());
+        $this->assertSame('Wiersdorf', $this->location->getCity());
+    }
+
+    public function testState(): void
+    {
+        $this->assertNull($this->location->getState());
+        $this->assertSame($this->location, $this->location->setState('NRW'));
+        $this->assertNotNull($this->location->getState());
+        $this->assertSame('NRW', $this->location->getState());
     }
 
     public function testCountryCode(): void
     {
         $this->assertNull($this->location->getCountryCode());
-        $this->assertSame($this->location, $this->location->setCountryCode('AT'));
+        $this->assertSame($this->location, $this->location->setCountryCode('DE'));
         $this->assertNotNull($this->location->getCountryCode());
-        $this->assertSame('AT', $this->location->getCountryCode());
+        $this->assertSame('DE', $this->location->getCountryCode());
+    }
+
+    public function testNotes(): void
+    {
+        $notes = 'Lorem ipsum dolor sit amet.';
+        $this->assertNull($this->location->getNotes());
+        $this->assertSame($this->location, $this->location->setNotes($notes));
+        $this->assertNotNull($this->location->getNotes());
+        $this->assertSame($notes, $this->location->getNotes());
+    }
+
+    public function testImage(): void
+    {
+        $image = $this->prophesize(MediaInterface::class);
+        $image->getId()->willReturn(42);
+
+        $this->assertNull($this->location->getImage());
+        $this->assertNull($this->location->getImageData());
+        $this->assertSame($this->location, $this->location->setImage($image->reveal()));
+        $this->assertSame($image->reveal(), $this->location->getImage());
+        $this->assertSame(['id' => 42], $this->location->getImageData());
     }
 }