Added PermissionManager and Vault support