Revert "Revert "added wrapper""

This reverts commit 479a7716a1ca6b4ccc3b03fb991343a98a9240c3.