Better option paths
Adapt example schema and configs to new option paths