Unified handling of options