Added selection lists and added currentValue method to fields.