Enhance primitives detection: detect wrappers
0.1.1