Adjust the current code to use the new models