Data framework fixes. Now we support models which can have fields stored outside the document.