Continued tuning the API