Moved to static dicationary file tracking