#199 Proposed API changes for endpoints.