added support for client specific templates