Updates for 1.0.0. Support ADM.