Added optgroups to lists