improve service template