Adding external defs support.