Add options and introduce