More ADT editing