Added wrapper