Add wrappers for types