Adding wrapper code