Update loaddata to new models