Test restructuring to remove patching overhead.
Make it possible to exlude drafts from the import.