Make service plan operations consistent with other operations