Added drop-down and multi-select lists