Implemented more endpoints