Added wrapper generator