external-tools improvements - memory management