Encounter builder - add non-creature NPCs to fight PCs

It would be super convenient to be able to add my non-creature BBEG in the encounter builder as the enemy. For instance, in a one shot I have a human wizard that is in control of a few clusters of spiders and i'm only able to add the spiders in the encounter and not the wizard.