Transfer class is now completely generic