Added support for file templates