Finished implementing API methods