Develop option enhancement

Condensed the logic from #581