Adding some more MACD support