Switched from NestedBeanItemProperty to own written EntityItem. Bugfixes