Update for ADT update and added new support lib