Added support for expanding files to string