Add more endpoints and expose in client