Updated for new operation names