Do option extraction better