Refactor to remove old TSRequestedOperation API