Made consistent with adding services