Added support for raw file