Make DAO includable as well as extendable