Add support for optgroup