Fix to use wrappers instead of primitive types