Minor updates to support more endpoints.