Add support for additional endpoints, add experimental support for strict_mode

No README updates yet.