diff --git a/addons/default/visiosoft/location-module/src/City/Command/GetCities.php b/addons/default/visiosoft/location-module/src/City/Command/GetCities.php
new file mode 100644
index 000000000..67fcd53ae
--- /dev/null
+++ b/addons/default/visiosoft/location-module/src/City/Command/GetCities.php
@@ -0,0 +1,34 @@
+<?php namespace Visiosoft\LocationModule\City\Command;
+
+use Visiosoft\LocationModule\City\CityModel;
+
+class GetCities
+{
+
+    /**
+     * @var $country
+     */
+    protected $country;
+
+    /**
+     * GetProduct constructor.
+     * @param $country
+     */
+    public function __construct($country)
+    {
+        $this->country = $country;
+    }
+
+
+    /**
+     * @param CityModel $groups
+     * @return |null
+     */
+    public function handle(CityModel $groups)
+    {
+        if ($this->country) {
+            return $groups->where('parent_country_id', $this->country)->get();
+        }
+        return $groups::query()->get();
+    }
+}
diff --git a/addons/default/visiosoft/location-module/src/Country/Command/GetCountries.php b/addons/default/visiosoft/location-module/src/Country/Command/GetCountries.php
new file mode 100644
index 000000000..9dfb99a54
--- /dev/null
+++ b/addons/default/visiosoft/location-module/src/Country/Command/GetCountries.php
@@ -0,0 +1,12 @@
+<?php namespace Visiosoft\LocationModule\Country\Command;
+
+use Visiosoft\LocationModule\Country\CountryModel;
+
+class GetCountries
+{
+
+    public function handle(CountryModel $groups)
+    {
+        return $groups::query()->get();
+    }
+}
diff --git a/addons/default/visiosoft/location-module/src/LocationModulePlugin.php b/addons/default/visiosoft/location-module/src/LocationModulePlugin.php
index 0b061185a..8addb2ae4 100644
--- a/addons/default/visiosoft/location-module/src/LocationModulePlugin.php
+++ b/addons/default/visiosoft/location-module/src/LocationModulePlugin.php
@@ -1,7 +1,9 @@
 <?php namespace Visiosoft\LocationModule;
 
 use Anomaly\Streams\Platform\Addon\Plugin\Plugin;
+use Visiosoft\LocationModule\City\Command\GetCities;
 use Visiosoft\LocationModule\City\Command\GetCity;
+use Visiosoft\LocationModule\Country\Command\GetCountries;
 use Visiosoft\LocationModule\Country\Command\GetCountry;
 use Visiosoft\LocationModule\District\Command\GetDistrict;
 use Visiosoft\LocationModule\Neighborhood\Command\GetNeighborhood;
@@ -49,6 +51,17 @@ class LocationModulePlugin extends Plugin
                     return $ad;
                 }
             ),
+            new \Twig_SimpleFunction(
+                'getCities',
+                function ($country = null) {
+
+                    if (!$ad = $this->dispatch(new GetCities($country))) {
+                        return null;
+                    }
+
+                    return $ad;
+                }
+            ),
             new \Twig_SimpleFunction(
                 'getCountry',
                 function ($id) {
@@ -60,6 +73,16 @@ class LocationModulePlugin extends Plugin
                     return $ad;
                 }
             ),
+            new \Twig_SimpleFunction(
+                'getCountries',
+                function () {
+
+                    if (!$ad = $this->dispatch(new GetCountries())) {
+                        return null;
+                    }
+                    return $ad;
+                }
+            ),
             new \Twig_SimpleFunction(
                 'getVillage',
                 function ($id) {