Document Builder - Make Available All Fact Find and Custom Fields

For some documents we want to add in things like income and employment, as well as info held in custom fields. It would be great if these are surfaced.