Added the rest of the api