* adds the vaultName as a metadata discriminator
cleans imports