Add support for additional attributes on <option> entries