Added wrapper.
Generified null types.