Re-wrap with Cython