Implement more api calls