Improve vaultmp.cbp