Need to include additional account types:

-Defined Benefit Plan

-Defined Contribution Qualified Plan (pre-tax but non-401k/403b/457)

-RSU

-NQSO

-ISO

-After-tax annuities

-Trust Account

There are probably other types I'm not thinking of, but these are types that exist within my client base.