Make models generic