Fix splitting of API