Added Volatility 2.4 support