Added support for picklists.