Use type definitions for option handlers
Do not store name into option