Add default service and change variable names.