Add Select option type
Remove deprecated section and let