Re-add the models bits