Added plain API support.