Updated to use a namespaced tear off capable API