Minor mod
Made Service.tpl more generic