- Mapping support for generating combo boxes is added