Added wrapper during compilation