Changes in Main and Base classes for Vault