Improved file location