Improved file locations