Added AutoFileName and Tag for testing

So far no complaints