Split API in two parts