Integrated ExternalSystem feature fix #11