Fix wrapper

Try to fix wrapper and reflect changes