Added generic wrapper (next commit)