Update clicking methods to add option param