[UPDATE] Fine tuning of the API