Split APIs in two