Back to master.
Add endpoints for better debugging.