Improving wrapper