Add a wrapper function, this should work with the existing infrastructure