Add working API v2 support