Zone support and generate vault key only if needed