Add flag to not pass options