Better option definitions