Adds checks for null valueLists
Adds values to input component annotation