Replace promise specific op with generic operator