Modify for OmniTorch