Now works with API