Change entry point of API for stateless (avoid static)
Merge branch 'new-api' of PR #9