API v2 support