Big update of ListModels (now everything should work)