Added support for ejs