Added correct service templates