Add conditional options