Add fields to the collection from the API and make it work