Fix: make template by client type