Updated for ADT

Updated for ADT