Don't listify Elements
Handle changes of ClassNumber and Name properly
Add proper data type handling for input