Add better option combinator