Added support for EJS SaaS