Added auto-op support