diff --git a/fieldservice/__manifest__.py b/fieldservice/__manifest__.py
index cf03364090..c064afd129 100644
--- a/fieldservice/__manifest__.py
+++ b/fieldservice/__manifest__.py
@@ -9,6 +9,7 @@
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
     'depends': [
+        'base_geolocalize',
         'mail',
         'web_timeline',
     ],
diff --git a/fieldservice/models/fsm_location.py b/fieldservice/models/fsm_location.py
index b5f0cad13c..7c3f5a8f6d 100644
--- a/fieldservice/models/fsm_location.py
+++ b/fieldservice/models/fsm_location.py
@@ -13,6 +13,24 @@ class FSMLocation(models.Model):
     partner_id = fields.Many2one('res.partner', string='Related Partner',
                                  required=True, ondelete='restrict',
                                  auto_join=True)
+    owner_id = fields.Many2one('res.partner', string='Related Owner',
+                               required=True, ondelete='restrict',
+                               auto_join=True)
+    customer_id = fields.Many2one('res.partner', string='Related Customer',
+                                  required=True, ondelete='restrict',
+                                  auto_join=True)
+    tag_ids = fields.Many2many('fsm.tag',
+                               string='Tags')
+    building = fields.Char(string='Building', size=35)
+    floor = fields.Char(string='Floor', size=35)
+    unit = fields.Char(string='Unit', size=35)
+    room = fields.Char(string='Room', size=35)
+    description = fields.Char(string='Description')
+    territory = fields.Char(string='Territory', size=35)
+    branch = fields.Char(string='Branch', size=35)
+    district = fields.Char(string='District', size=35)
+    region = fields.Char(string='Region', size=35)
+    timezone = fields.Char(string='Timezone', size=35)
 
     @api.model
     def create(self, vals):
diff --git a/fieldservice/views/fsm_location.xml b/fieldservice/views/fsm_location.xml
index 2545459669..949df5a0ab 100644
--- a/fieldservice/views/fsm_location.xml
+++ b/fieldservice/views/fsm_location.xml
@@ -1,17 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <!-- Field Service Location -->
+    <!-- Field Service Location Tree View-->
     <record id="fsm_location_tree_view" model="ir.ui.view">
         <field name="name">fsm.location.tree</field>
         <field name="model">fsm.location</field>
         <field name="arch" type="xml">
             <tree string="Locations">
                 <field name="name"/>
+                <field name="owner_id"/>
+                <field name="customer_id"/>
+                <field name="building"/>
+                <field name="floor"/>
+                <field name="unit"/>
+                <field name="room"/>
+                <field name="partner_latitude"/>
+                <field name="partner_longitude"/>
             </tree>
         </field>
     </record>
 
+    <!-- Field Service Location Form View-->
     <record id="fsm_location_form_view" model="ir.ui.view">
         <field name="name">fsm.location.form</field>
         <field name="model">fsm.location</field>
@@ -21,32 +30,99 @@
                     <group>
                         <group>
                             <field name="name"/>
+                            <field name="partner_id"/>
+                            <field name="owner_id"/>
+                            <field name="customer_id"/>
+                        </group>
+                        <group>
+                            <field name="building"/>
+                            <field name="floor"/>
+                            <field name="unit"/>
+                            <field name="room"/>
+                            <field name="partner_latitude"/>
+                            <field name="partner_longitude"/>
                         </group>
-                        <group></group>
                     </group>
                     <notebook>
                         <page string="Directions">
                             <field name="direction" nolabel="1" widget="html"/>
                         </page>
+                        <page string="Address Information">
+                            <group>
+                                <group>
+                                    <field name="territory"/>
+                                    <field name="branch"/>
+                                    <field name="district"/>
+                                    <field name="region"/>
+                                </group>
+                                <group>
+                                    <field name="street"/>
+                                    <field name="street2"/>
+                                    <field name="city"/>
+                                    <field name="state_id"/>
+                                    <field name="zip"/>
+                                    <field name="country_id"/>
+                                </group>
+                            </group>
+                            <newline/>
+                            <group>
+                                <field name="description"/>
+                                <field name="timezone"/>
+                            </group>
+                        </page>
                     </notebook>
                 </sheet>
             </form>
         </field>
     </record>
 
+    <!-- Field Service Location Search View-->
+    <record id="fsm_location_search_view" model="ir.ui.view">
+        <field name="name">fsm.location.search</field>
+        <field name="model">fsm.location</field>
+        <field name="arch" type="xml">
+            <search string="Search FSM Location">
+                <field name="name" filter_domain="['|', ('name','ilike',self)]" string="FSM Location"/>
+                <field name="partner_id"/>
+                <field name="owner_id"/>
+                <field name="customer_id"/>
+                <field name="building"/>
+                <field name="floor"/>
+                <field name="unit"/>
+                <field name="room"/>
+                <field name="partner_latitude"/>
+                <field name="partner_longitude"/>
+                <field name="territory"/>
+                <field name="branch"/>
+                <field name="district"/>
+                <field name="region"/>
+                <field name="street"/>
+                <field name="street2"/>
+                <field name="city"/>
+                <field name="state_id"/>
+                <field name="zip"/>
+                <field name="country_id"/>
+                <field name="description"/>
+                <field name="timezone"/>
+                <group expand="0" string="Group By">
+                    <filter string="Owner" domain="[]" context="{'group_by':'owner_id'}"/>
+                    <filter string="Customer" domain="[]" context="{'group_by':'customer_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
     <record id="action_fsm_location" model="ir.actions.act_window">
         <field name="name">Service Locations</field>
         <field name="res_model">fsm.location</field>
         <field name="view_id" ref="fsm_location_tree_view"/>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="fsm_location_search_view"/>
         <field name="help" type="html">
             <p class="oe_view_nocontent_create">
                 Create a Service Locations.
             </p>
-            <p>
-                Module not yet enabled.
-            </p>
         </field>
     </record>