Added support for None files