Fully implemented private endpoints to spec