Add support for ADT