The generalised additional fields and the more specific borrower attributes features overlap in a lot of ways. We should consider merging them to DRY out the codebase and allow us to enhance both area's once rather than having to replicate code each time we want to enhance their functionality.