Changed the api result parsing and adapted some fields.