Maybe we should break out the operations then? It seems weird that the operation itself wouldn't take care of this. I think the difficulty naming this extra class may be due to that?