optimize wrapper inclusion