Updated client templates