Updated ListClass and ListModel