Better external call tagging
Better logic around filename creation