Improved file includes