Feature: Option adding