Use validateOptions everywhere
Add more docs