Refactored tpl bindings