Switch to using raneto-core