Adding better option handling