Added some basics to manage the API