Updated service template