Add /sp/ support