Rework the user document structure