Add conditional options to Parser