Updated to latest tanuki wrapper