Fix model relations and work arround it
Merge pull request #9 from vut23/fix-wui-relations

Fix model relations and work arround it