Implement some vault handling