Added support for EXTERNAL