diff --git a/addons/default/visiosoft/location-module/src/City/Command/GetCity.php b/addons/default/visiosoft/location-module/src/City/Command/GetCity.php
new file mode 100644
index 000000000..efe367a10
--- /dev/null
+++ b/addons/default/visiosoft/location-module/src/City/Command/GetCity.php
@@ -0,0 +1,34 @@
+<?php namespace Visiosoft\LocationModule\City\Command;
+
+use Visiosoft\LocationModule\City\CityModel;
+
+class GetCity
+{
+
+    /**
+     * @var $id
+     */
+    protected $id;
+
+    /**
+     * GetProduct constructor.
+     * @param $id
+     */
+    public function __construct($id)
+    {
+        $this->id = $id;
+    }
+
+
+    /**
+     * @param CityModel $groups
+     * @return |null
+     */
+    public function handle(CityModel $groups)
+    {
+        if ($this->id) {
+            return $groups->find($this->id);
+        }
+        return null;
+    }
+}
diff --git a/addons/default/visiosoft/location-module/src/Country/Command/GetCountry.php b/addons/default/visiosoft/location-module/src/Country/Command/GetCountry.php
new file mode 100644
index 000000000..0e41d4925
--- /dev/null
+++ b/addons/default/visiosoft/location-module/src/Country/Command/GetCountry.php
@@ -0,0 +1,33 @@
+<?php namespace Visiosoft\LocationModule\Country\Command;
+
+use Visiosoft\LocationModule\Country\CountryModel;
+
+class GetCountry
+{
+
+    /**
+     * @var $id
+     */
+    protected $id;
+
+    /**
+     * GetProduct constructor.
+     * @param $id
+     */
+    public function __construct($id)
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * @param CountryModel $groups
+     * @return |null
+     */
+    public function handle(CountryModel $groups)
+    {
+        if ($this->id) {
+            return $groups->find($this->id);
+        }
+        return null;
+    }
+}
diff --git a/addons/default/visiosoft/location-module/src/LocationModulePlugin.php b/addons/default/visiosoft/location-module/src/LocationModulePlugin.php
index 23db88713..9d9d16ff9 100644
--- a/addons/default/visiosoft/location-module/src/LocationModulePlugin.php
+++ b/addons/default/visiosoft/location-module/src/LocationModulePlugin.php
@@ -1,6 +1,8 @@
 <?php namespace Visiosoft\LocationModule;
 
 use Anomaly\Streams\Platform\Addon\Plugin\Plugin;
+use Visiosoft\LocationModule\City\Command\GetCity;
+use Visiosoft\LocationModule\Country\Command\GetCountry;
 use Visiosoft\LocationModule\District\Command\GetDistrict;
 use Visiosoft\LocationModule\Neighborhood\Command\GetNeighborhood;
 
@@ -32,6 +34,28 @@ class LocationModulePlugin extends Plugin
                         return null;
                     }
 
+                    return $ad;
+                }
+            ),
+            new \Twig_SimpleFunction(
+                'getCity',
+                function ($id) {
+
+                    if (!$ad = $this->dispatch(new GetCity($id))) {
+                        return null;
+                    }
+
+                    return $ad;
+                }
+            ),
+            new \Twig_SimpleFunction(
+                'getCountry',
+                function ($id) {
+
+                    if (!$ad = $this->dispatch(new GetCountry($id))) {
+                        return null;
+                    }
+
                     return $ad;
                 }
             ),
diff --git a/addons/default/visiosoft/profile-module/src/Adress/Command/GetAddress.php b/addons/default/visiosoft/profile-module/src/Adress/Command/GetAddress.php
new file mode 100644
index 000000000..03a326442
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/src/Adress/Command/GetAddress.php
@@ -0,0 +1,34 @@
+<?php namespace Visiosoft\ProfileModule\Adress\Command;
+
+
+use Visiosoft\ProfileModule\Adress\Contract\AdressRepositoryInterface;
+
+class GetAddress
+{
+
+    /**
+     * @var $id
+     */
+    protected $id;
+
+    /**
+     * GetProduct constructor.
+     * @param $id
+     */
+    public function __construct($id)
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * @param AdressRepositoryInterface $adressRepository
+     * @return \Anomaly\Streams\Platform\Model\EloquentModel|null
+     */
+    public function handle(AdressRepositoryInterface $adressRepository)
+    {
+        if ($this->id) {
+            return $adressRepository->find($this->id);
+        }
+        return null;
+    }
+}
diff --git a/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php b/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php
index 749ee3007..8f6e6a8cf 100644
--- a/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php
+++ b/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php
@@ -1,6 +1,7 @@
 <?php namespace Visiosoft\ProfileModule;
 
 use Anomaly\Streams\Platform\Addon\Plugin\Plugin;
+use Visiosoft\ProfileModule\Adress\Command\GetAddress;
 use Visiosoft\ProfileModule\Profile\Command\FindUserProfile;
 
 class ProfileModulePlugin extends Plugin
@@ -20,6 +21,17 @@ class ProfileModulePlugin extends Plugin
                         return null;
                     }
 
+                    return $ad;
+                }
+            ),
+            new \Twig_SimpleFunction(
+                'getAddress',
+                function ($id) {
+
+                    if (!$ad = $this->dispatch(new GetAddress($id))) {
+                        return null;
+                    }
+
                     return $ad;
                 }
             )