Upgrade auto-presenter to V2