Support external (9/16)

Support external