Better option handling and implementation