Make static option classes namespaces instead