Add more stuff to emulate Canto