Added file/url conditional