More work on volatility cube refactoring