Improved performance, save filename and line nbr