Use extras field in API to obtain more info
Fix test