Add auto-follow option