Added support for ADT compilation