Adding wrapper class