Added option functionality