More work on improving wrapper