Budgetdoc refactor