Added wrapper on S008