Support external (7/16)

Support external