Network system now fully uses generics