Should work more on the API