Updated for types endpoints.