Add auto extend options functionality