Add spjinx support