Patching up old service template