Adding aki support.