Updated work with ADM