Switched from SimpleAPI to internal API.