Enhanced the generics of the model, wrapper system.