Added support for specifying singular option groups