Added some support for reading files