Added option handling basics