Adds autofocus on cli