Updated Operation service logic