Added ADF mode support