Add Vaultaire.Control where needed