Minor refactoring
Now returning the actual document only. Metadata will be provided separately on-demand.