#606 updated usage endpoints.