Included support for both url and file