Add DocumentItemMixin and fix related objects