diff --git a/accommodation/accommodation.pro b/accommodation/accommodation.pro
index edfc4da..8634a1f 100644
--- a/accommodation/accommodation.pro
+++ b/accommodation/accommodation.pro
@@ -17,7 +17,8 @@ SOURCES += accommodation.cpp \
     accommodationservice.cpp \
     tablemodel.cpp \
     acform.cpp \
-    accgrid.cpp
+    accgrid.cpp \
+    data/address.cpp
 
 HEADERS += accommodation.h\
         accommodation_global.h \
@@ -25,7 +26,9 @@ HEADERS += accommodation.h\
     accommodationservice.h \
     tablemodel.h \
     acform.h \
-    accgrid.h
+    accgrid.h \
+    data/address.h \
+    data/accommodation-data.h
 
 unix {
     target.path = /usr/lib
@@ -53,7 +56,7 @@ OTHER_FILES += \
 FORMS += \
     acform.ui
 
-ODB_FILES = accommodation/data/person.h
+ODB_FILES = accommodation/data/accommodation-data.h
 H_DIR = $$PWD/data/*.h
 include(../odb.pri)
 
diff --git a/accommodation/acform.cpp b/accommodation/acform.cpp
index e412f6c..1a8aaff 100644
--- a/accommodation/acform.cpp
+++ b/accommodation/acform.cpp
@@ -1,5 +1,8 @@
 #include "acform.h"
 #include "ui_acform.h"
+#include <QList>
+
+#include "accommodation-odb.hxx"
 
 AcForm::AcForm(QWidget *parent) :
     AutoForm<Person>(parent),
@@ -15,3 +18,14 @@ AcForm::~AcForm()
 {
     delete ui;
 }
+
+void AcForm::registerCombos()
+{
+    QList<ComboData> cbData;
+    Service<Address> srv;
+    foreach (QSharedPointer<Address> adr, srv.all()) {
+        cbData.append(ComboData(adr));
+    }
+
+    registerBinding(ui->address, cbData);
+}
diff --git a/accommodation/acform.h b/accommodation/acform.h
index 634f3b0..1b23103 100644
--- a/accommodation/acform.h
+++ b/accommodation/acform.h
@@ -21,6 +21,10 @@ public:
 
 private:
     Ui::AcForm *ui;
+
+    // AutoForm interface
+protected:
+    virtual void registerCombos();
 };
 
 #endif // ACFORM_H
diff --git a/accommodation/acform.ui b/accommodation/acform.ui
index 5e7aabe..f1b3c3d 100644
--- a/accommodation/acform.ui
+++ b/accommodation/acform.ui
@@ -46,6 +46,16 @@
     <string>PushButton</string>
    </property>
   </widget>
+  <widget class="QComboBox" name="address">
+   <property name="geometry">
+    <rect>
+     <x>110</x>
+     <y>170</y>
+     <width>191</width>
+     <height>22</height>
+    </rect>
+   </property>
+  </widget>
  </widget>
  <resources/>
  <connections/>
diff --git a/accommodation/data/accommodation-data.h b/accommodation/data/accommodation-data.h
new file mode 100644
index 0000000..bf6ad45
--- /dev/null
+++ b/accommodation/data/accommodation-data.h
@@ -0,0 +1,8 @@
+#ifndef ACCOMMODATIONDATA_H
+#define ACCOMMODATIONDATA_H
+
+#include "address.h"
+#include "person.h"
+
+#endif // ACCOMMODATIONDATA_H
+
diff --git a/accommodation/data/address.cpp b/accommodation/data/address.cpp
new file mode 100644
index 0000000..ba7cb5b
--- /dev/null
+++ b/accommodation/data/address.cpp
@@ -0,0 +1,58 @@
+#include "address.h"
+
+Address::Address(QObject *parent) : ComboItem(parent)
+{
+
+}
+
+Address::~Address()
+{
+
+}
+QString Address::city() const
+{
+    return m_city;
+}
+
+void Address::setCity(const QString &city)
+{
+    m_city = city;
+}
+QString Address::street() const
+{
+    return m_street;
+}
+
+void Address::setStreet(const QString &street)
+{
+    m_street = street;
+}
+QString Address::houseNumber() const
+{
+    return m_houseNumber;
+}
+
+void Address::setHouseNumber(const QString &houseNumber)
+{
+    m_houseNumber = houseNumber;
+}
+int Address::id() const
+{
+    return m_id;
+}
+
+void Address::setId(int id)
+{
+    m_id = id;
+}
+
+bool Address::eq(ComboItem *other)
+{
+    Address *addr = qobject_cast<Address*>(other);
+    return addr != NULL && m_id == addr->id();
+}
+
+QString Address::toString()
+{
+    return m_street + ", " + m_houseNumber + ", " + m_city;
+}
diff --git a/accommodation/data/address.h b/accommodation/data/address.h
new file mode 100644
index 0000000..c81bbfd
--- /dev/null
+++ b/accommodation/data/address.h
@@ -0,0 +1,55 @@
+#ifndef ADDRESS_H
+#define ADDRESS_H
+
+#include <QObject>
+#include <QString>
+
+#include <data/comboitem.h>
+
+#include <odb/core.hxx>
+
+#pragma db object
+class Address : public ComboItem
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString city READ city WRITE setCity)
+    Q_PROPERTY(QString street READ street WRITE setStreet)
+    Q_PROPERTY(QString houseNumber READ houseNumber WRITE setHouseNumber)
+
+public:
+    explicit Address(QObject *parent = 0);
+    ~Address();
+
+    QString city() const;
+    void setCity(const QString &city);
+
+    QString street() const;
+    void setStreet(const QString &street);
+
+    QString houseNumber() const;
+    void setHouseNumber(const QString &houseNumber);
+
+    int id() const;
+    void setId(int id);
+
+private:
+    friend class odb::access;
+
+#pragma db id auto
+    int m_id;
+    QString m_city;
+    QString m_street;
+    QString m_houseNumber;
+
+signals:
+
+public slots:
+
+    // ComboItem interface
+public:
+    virtual bool eq(ComboItem *other);
+    virtual QString toString();
+};
+
+#endif // ADDRESS_H
diff --git a/accommodation/data/person.cpp b/accommodation/data/person.cpp
index 3c785a0..850df47 100644
--- a/accommodation/data/person.cpp
+++ b/accommodation/data/person.cpp
@@ -1,3 +1,4 @@
+#include <data/comboitem.h>
 #include "person.h"
 
 Person::Person()
@@ -30,6 +31,19 @@ void Person::setLastName(const QString &value)
 {
     lastName = value;
 }
+QSharedPointer<QObject> Person::address() const
+{
+    return m_address;
+}
+
+void Person::setAddress(const QSharedPointer<QObject> &address)
+{
+    if (qobject_cast<Address*>(address.data()) != NULL)
+    {
+        m_address = qSharedPointerDynamicCast<Address, QObject>(address);
+    }
+}
+
 
 
 
diff --git a/accommodation/data/person.h b/accommodation/data/person.h
index bf784fa..a2d3659 100644
--- a/accommodation/data/person.h
+++ b/accommodation/data/person.h
@@ -4,6 +4,8 @@
 #include <QObject>
 #include <QString>
 
+#include "address.h"
+
 #include <odb/core.hxx>
 
 #pragma db object
@@ -13,6 +15,7 @@ class Person : public QObject
 
     Q_PROPERTY(QString firstName READ getFirstName WRITE setFirstName)
     Q_PROPERTY(QString lastName READ getLastName WRITE setLastName)
+    Q_PROPERTY(QSharedPointer<QObject> address READ address WRITE setAddress)
 public:
     Person();
 
@@ -25,12 +28,16 @@ public:
     QString getLastName() const;
     void setLastName(const QString &value);
 
+    QSharedPointer<QObject> address() const;
+    void setAddress(const QSharedPointer<QObject> &address);
+
 private:
     friend class odb::access;
 #pragma db id auto
     int m_id;
     QString firstName;
     QString lastName;
+    QSharedPointer<Address> m_address;
 
 };
 
diff --git a/core/autoform.h b/core/autoform.h
index fd0bbf3..760b3dc 100644
--- a/core/autoform.h
+++ b/core/autoform.h
@@ -9,6 +9,7 @@
 #include <QDebug>
 #include <QVariant>
 #include <QMessageBox>
+#include <QComboBox>
 
 #include "iform.h"
 #include "service.h"
@@ -16,6 +17,7 @@
 #include "iservice.h"
 #include "iplugin.h"
 
+#include "combodata.h"
 
 template <class T>
 class AutoForm : public IForm
@@ -53,6 +55,10 @@ public:
         }
     }
 
+    void registerBinding(QComboBox *combo, const QList<ComboData> &values) {
+        m_bindCombos[combo] = values;
+    }
+
     void registerValidator(IValidator *validator) {
         m_validators.append(validator);
     }
@@ -60,18 +66,46 @@ public:
 protected:
     virtual void bindOtherToUi() {}
     virtual bool bindOtherToData() { return true; }
+    virtual void registerCombos() {}
 
 private:
     QSharedPointer<T> m_entity;
     QList<QWidget*> m_bindWidgets;
     QList<IValidator*> m_validators;
+    QHash<QComboBox*, QList<ComboData> > m_bindCombos;
     bool m_newRec;
 
     void bindToUi() {
+        registerCombos();
         foreach (QWidget *widget, m_bindWidgets) {
             const char* prop = widget->metaObject()->userProperty().name();
             widget->setProperty(prop, ((QObject*)m_entity.data())->property(widget->objectName().toStdString().c_str()));
         }
+
+        foreach (QComboBox *combo, m_bindCombos.keys()) {
+            int idx = 0;
+            QVariant field = ((QObject*)m_entity.data())->property(combo->objectName().toStdString().c_str());
+
+            combo->clear();
+            for (int i = 0; i < m_bindCombos[combo].size(); i++) {
+                ComboData data = m_bindCombos[combo][i];
+                combo->addItem(data.label(), data.index());
+
+                if (data.index().canConvert<QObject*>()) {
+                    ComboItem* ci = qobject_cast<ComboItem*>(data.index().value<QObject*>());
+                    ComboItem* ciField = qobject_cast<ComboItem*>(field.value<QObject*>());
+                    if (ci->eq(ciField)) {
+                        idx = i;
+                    }
+                }
+                else if (field == data.index()) {
+                    idx = i;
+                }
+            }
+
+            combo->setCurrentIndex(idx);
+        }
+
         bindOtherToUi();
     }
 
@@ -88,6 +122,10 @@ private:
             ((QObject*)m_entity.data())->setProperty(widget->objectName().toStdString().c_str(), widget->property(prop));
         }
 
+        foreach (QComboBox *combo, m_bindCombos.keys()) {
+            ((QObject*)m_entity.data())->setProperty(combo->objectName().toStdString().c_str(), combo->currentData());
+        }
+
         return bindOtherToData();
     }
 
diff --git a/core/autotablemodel.h b/core/autotablemodel.h
index 307319f..196b935 100644
--- a/core/autotablemodel.h
+++ b/core/autotablemodel.h
@@ -10,6 +10,7 @@
 #include "core_global.h"
 #include "exprevaluator.h"
 #include "itablemodel.h"
+#include "data/comboitem.h"
 
 template<class T>
 class AutoTableModel : public ITableModel
@@ -51,7 +52,13 @@ public:
             QSharedPointer<T> entity = m_list.at(index.row());
             QObject *rawEntity = (QObject*)entity.data();
 
-            return rawEntity->property(rawEntity->metaObject()->property(index.column() + 1).name());
+            QVariant dispData = rawEntity->property(rawEntity->metaObject()->property(index.column() + 1).name());
+            if (dispData.canConvert<QObject*>() && qobject_cast<ComboItem*>(dispData.value<QObject*>()))
+            {
+                return qobject_cast<ComboItem*>(dispData.value<QObject*>())->toString();
+            }
+
+            return dispData;
         }
 
         return QVariant::Invalid;
diff --git a/core/combodata.cpp b/core/combodata.cpp
new file mode 100644
index 0000000..8f02b40
--- /dev/null
+++ b/core/combodata.cpp
@@ -0,0 +1,42 @@
+#include "combodata.h"
+
+ComboData::ComboData(const QVariant &index, const QString &label)
+{
+    m_index = index;
+    m_label = label;
+}
+
+ComboData::ComboData(const QSharedPointer<QObject> &index)
+{
+    m_index = QVariant::fromValue(index);
+    ComboItem *ci = qobject_cast<ComboItem*>(index.data());
+
+    if (ci != NULL)
+    {
+        m_label = ci->toString();
+    }
+}
+
+ComboData::~ComboData()
+{
+}
+
+QVariant ComboData::index() const
+{
+    return m_index;
+}
+
+void ComboData::setIndex(const QVariant &index)
+{
+    m_index = index;
+}
+
+QString ComboData::label() const
+{
+    return m_label;
+}
+
+void ComboData::setLabel(const QString &label)
+{
+    m_label = label;
+}
diff --git a/core/combodata.h b/core/combodata.h
new file mode 100644
index 0000000..2e8bfff
--- /dev/null
+++ b/core/combodata.h
@@ -0,0 +1,28 @@
+#ifndef COMBODATA_H
+#define COMBODATA_H
+
+#include <QVariant>
+#include <QSharedDataPointer>
+
+#include "core_global.h"
+#include "data/comboitem.h"
+
+class CORESHARED_EXPORT ComboData
+{
+public:
+    ComboData(const QVariant &index, const QString &label);
+    ComboData(const QSharedPointer<QObject> &index);
+    ~ComboData();
+
+    QVariant index() const;
+    void setIndex(const QVariant &index);
+
+    QString label() const;
+    void setLabel(const QString &label);
+
+private:
+    QVariant m_index;
+    QString m_label;
+};
+
+#endif // COMBODATA_H
diff --git a/core/context.cpp b/core/context.cpp
index be095d2..e052ee8 100644
--- a/core/context.cpp
+++ b/core/context.cpp
@@ -49,7 +49,7 @@ void Context::loadPlugins()
     m_plugins.append(new Users);
     m_plugins.append(new Roles);
 
-    QDir pluginsDir(qApp->applicationDirPath() + "/../plugins");
+    QDir pluginsDir(qApp->applicationDirPath() + "/../../plugins");
 
     foreach (QString fileName, pluginsDir.entryList(QStringList() << "*.so" << "*.dll")) {
         QPluginLoader pluginLoader(pluginsDir.absoluteFilePath(fileName));
@@ -96,10 +96,10 @@ void Context::destroy()
         m_dbOpened = false;
     }
 
-    if (m_settings != NULL && m_settings->parent() == NULL)
+    /*if (m_settings != NULL && m_settings->parent() == NULL)
     {
         delete m_settings;
-    }
+    }*/
 
     foreach (IPlugin *plugin, m_plugins)
     {
diff --git a/core/core.h b/core/core.h
index 0bfc109..851755f 100644
--- a/core/core.h
+++ b/core/core.h
@@ -8,5 +8,6 @@
 #include "transaction.h"
 #include "gridform.h"
 #include "permissionservice.h"
+#include "combodata.h"
 
 #endif // CORE_H
diff --git a/core/core.pro b/core/core.pro
index 509247f..ea2edf0 100644
--- a/core/core.pro
+++ b/core/core.pro
@@ -43,7 +43,9 @@ SOURCES += \
     savefilterdialog.cpp \
     filterdialog.cpp \
     itablemodel.cpp \
-    iservice.cpp
+    iservice.cpp \
+    combodata.cpp \
+    data/comboitem.cpp
 
 HEADERS += core.h\
         core_global.h \
@@ -84,7 +86,9 @@ HEADERS += core.h\
     filterdialog.h \
     itablemodel.h \
     data/core_global.h \
-    iservice.h
+    iservice.h \
+    combodata.h \
+    data/comboitem.h
 
 unix {
     target.path = /usr/lib
@@ -121,3 +125,5 @@ FORMS += \
 OTHER_FILES += \
     users/metaData.json \
     roles/metaData.json
+
+TRANSLATIONS = core_cz.ts
diff --git a/core/data/comboitem.cpp b/core/data/comboitem.cpp
new file mode 100644
index 0000000..04f2b3b
--- /dev/null
+++ b/core/data/comboitem.cpp
@@ -0,0 +1,11 @@
+#include "comboitem.h"
+
+ComboItem::ComboItem(QObject *parent)
+    :QObject(parent)
+{
+}
+
+ComboItem::~ComboItem()
+{
+}
+
diff --git a/core/data/comboitem.h b/core/data/comboitem.h
new file mode 100644
index 0000000..6540e65
--- /dev/null
+++ b/core/data/comboitem.h
@@ -0,0 +1,21 @@
+#ifndef COMBOITEM_H
+#define COMBOITEM_H
+
+#include "core_global.h"
+#include <QSharedPointer>
+#include <QVariant>
+#include <QObject>
+
+class CORESHARED_EXPORT ComboItem : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit ComboItem(QObject *parent = NULL);
+    ~ComboItem();
+
+    virtual bool eq(ComboItem *other) = 0;
+    virtual QString toString() = 0;
+};
+
+#endif // COMBOITEM_H
diff --git a/odb.pri b/odb.pri
index 237db9a..43ad744 100644
--- a/odb.pri
+++ b/odb.pri
@@ -42,6 +42,7 @@ DEFINES += DATABASE_SQLITE
 #
 ODB_FLAGS += -I $$[QT_INSTALL_HEADERS]
 ODB_FLAGS += -I $$[QT_INSTALL_HEADERS]/QtCore
+ODB_FLAGS += -I $$PWD/core
 ODB_FLAGS += -D __PIC__
 
 win32 {